From 4d298b4a08895cb0989d3f0fd96293ca40125491 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Tue, 6 Apr 2021 11:23:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liuwanr/entity/ProjectManagement.java     | 36 +++++++++----------
 .../mapper/ProjectManagementMapper.java       |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java b/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java
index f9b8fbf..119bfed 100644
--- a/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java
+++ b/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java
@@ -65,6 +65,24 @@ public class ProjectManagement {
     @ApiModelProperty(hidden = true)
     private Integer isShow;
 
+    @ApiModelProperty(value = "是否启用实验数据(0启用 1不启用)", name = "isstartexperimental", example = "0", required = true)
+    private Integer isstartexperimental;//是否启用实验数据(0启用 1不启用)
+
+    @ApiModelProperty(value = "是否启用实验提示(0启用 1不启用)", name = "isstartexperimentSuggests", example = "0", required = true)
+    private Integer isstartexperimentSuggests;
+
+    @ApiModelProperty(value = "用户ID", name = "userId", example = "4", required = true)
+    private Integer userId;
+
+    @ApiModelProperty(value = "知识点是否启用(0、启用 1、不展示)", name = "knowledgePointsIsEnable", example = "0", required = true)
+    private Integer knowledgePointsIsEnable;
+
+    @ApiModelProperty(value = "实验介绍是否启用(0、启用 1、不展示)", name = "userId", example = "0", required = true)
+    private Integer experimentIntroductionIsEnable;
+
+    @ApiModelProperty(value = "是否启用(0:启用,1:禁用)")
+    private Integer enable;
+
     public Integer getPageNo() {
         return pageNo;
     }
@@ -89,24 +107,6 @@ public class ProjectManagement {
         this.pageSize = pageSize;
     }
 
-    @ApiModelProperty(value = "是否启用实验数据(0启用 1不启用)", name = "isstartexperimental", example = "0", required = true)
-    private Integer isstartexperimental;//是否启用实验数据(0启用 1不启用)
-
-    @ApiModelProperty(value = "是否启用实验提示(0启用 1不启用)", name = "isstartexperimentSuggests", example = "0", required = true)
-    private Integer isstartexperimentSuggests;
-
-    @ApiModelProperty(value = "用户ID", name = "userId", example = "4", required = true)
-    private Integer userId;
-
-    @ApiModelProperty(value = "知识点是否启用(0、启用 1、不展示)", name = "knowledgePointsIsEnable", example = "0", required = true)
-    private Integer knowledgePointsIsEnable;
-
-    @ApiModelProperty(value = "实验介绍是否启用(0、启用 1、不展示)", name = "userId", example = "0", required = true)
-    private Integer experimentIntroductionIsEnable;
-
-    @ApiModelProperty(value = "是否启用(0:启用,1:禁用)")
-    private Integer enable;
-
     public Integer getEnable() {
         return enable;
     }
diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index 951d580..35f64d9 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -70,7 +70,7 @@ public interface ProjectManagementMapper {
     @Select({"<script>",
             "select * from hr_project_management where enable = 0",//(roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0)",
             "<if test='userId==null'>AND founder != 14  AND isdel = 0 AND projectPermissions != 0</if>",
-            " <if test='userId!=null'>AND ((AND founder != 14  AND isdel = 0 AND projectPermissions != 0) " +
+            " <if test='userId!=null'>AND ((founder != 14  AND isdel = 0 AND projectPermissions != 0) " +
                     " OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} ))</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
             " <if test='systemId!=null'> and systemId=#{systemId}</if>",
             " <if test='queryName!=null'> and projectName LIKE '%' #{queryName} '%'</if>",