From a079c9e9c93379297915763e2b38cc49ef608a7d Mon Sep 17 00:00:00 2001
From: pd <2776455882@qq.com>
Date: Tue, 11 Aug 2020 14:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E5=92=8C?=
 =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AB=AF=E5=88=86=E5=88=AB=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/Project_ManagementMapper.java      | 26 ++++++++++++++-----
 .../service/Project_ManagementService.java    |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/Project_ManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/Project_ManagementMapper.java
index a80a684..eb7c9a0 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/Project_ManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/Project_ManagementMapper.java
@@ -34,15 +34,29 @@ public interface Project_ManagementMapper {
      *
      * @param management
      * @return
+     *  "select projectId,projectName,projectPermissions,founder,creationTime,state from hr_project_management where isdel=0",
+     *             " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
+     *             " <if test='founder!=null and userId==null'> and founder=#{founder}</if>",//服务端跳项目管理
+     *             " <if test='founder==null and userId!=null'> and (userId=#{userId} or founder = 0)</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
+     *             " <if test='founder==0 and userId!=null'> and founder=#{founder}</if>",//教师选择创建人为系统
+     *             " <if test='founder==1 and userId!=null'> and userId=#{userId}</if>",//教师选则创建人为老师
+     *             " <if test='state!=null'> and state=#{state}</if>",
+     *             " <if test='systemId!=null'> and systemId=#{systemId}</if>",
+     *             " <if test='projectName!=null'> and projectName like concat('%',#{projectName},'%')</if>",
+     *             " ORDER BY creationTime desc",
      */
     @Select({"<script>",
             "select projectId,projectName,projectPermissions,founder,creationTime,state from hr_project_management where isdel=0",
-            " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
-            " <if test='founder!=null'> and founder=#{founder}</if>",
-            " <if test='userId!=null'> and (userId=#{userId} or founder = 0)</if>",
-            " <if test='state!=null'> and state=#{state}</if>",
-            " <if test='systemId!=null'> and systemId=#{systemId}</if>",
-            " <if test='projectName!=null'> and projectName like concat('%',#{projectName},'%')</if>",
+           " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
+//            " <if test='founder!=null'> and founder=#{founder}</if>",
+//            " <if test='userId!=null'> and (userId=#{userId} or founder = 0)</if>",
+            " <if test='userId==null and founder!=null '> and founder=#{founder}</if>",//服务端跳项目管理
+            " <if test='userId!=null and founder==null'> and (userId=#{userId} or founder = 0)</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
+            " <if test='userId!=null and founder==0'> and founder=#{founder}</if>",//教师选择创建人为系统
+            " <if test='userId!=null and founder==1'> and userId=#{userId}</if>",//教师选则创建人为老师
+           " <if test='state!=null'> and state=#{state}</if>",
+           " <if test='systemId!=null'> and systemId=#{systemId}</if>",
+           " <if test='projectName!=null'> and projectName like concat('%',#{projectName},'%')</if>",
             " ORDER BY creationTime desc",
             "</script>"})
     List<Project_Management> queryManagements(Project_Management management);
diff --git a/src/main/java/com/yipin/liuwanr/service/Project_ManagementService.java b/src/main/java/com/yipin/liuwanr/service/Project_ManagementService.java
index 2480e4c..bfea4c1 100644
--- a/src/main/java/com/yipin/liuwanr/service/Project_ManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/Project_ManagementService.java
@@ -87,7 +87,7 @@ public class Project_ManagementService {
                     return resp;
                 }
                 //角色等于管理员或者超级管理员
-                else if (roleId == 1 || roleId == 2) {
+                else if (roleId == 1 ) {
                     vo.setUserId(null);
                 }
             }