From 2c8febc6e5d6805c624ab5b46f13a185c597f036 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Wed, 21 Apr 2021 11:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=80=83=E6=A0=B8=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yipin/liuwanr/mapper/ProjectManagementMapper.java     | 4 ++--
 .../com/yipin/liuwanr/service/ProjectManagementService.java   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index 8e96456..514df05 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -96,8 +96,8 @@ 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 roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0</if>",
-            " <if test='userId!=null'>AND ((roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0) OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} ))</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
+            "<if test='userId==null'>AND isdel = 0 AND projectPermissions != 0</if>",
+            " <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>",
             " ORDER BY creationTime desc",
diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index 16acbc8..9700cbb 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -91,6 +91,10 @@ public class ProjectManagementService {
                     vo.setUserId(null);
                 }
             }
+            //项目创建人暂存权限id 超管不存
+            if (!"1".equals(roleId)) {
+                vo.setFounder(roleId);
+            }
             PageHelper.startPage(pageNo, pageSize);
             //条件查询
             List<ProjectManagement> list = mapper.queryManagementsExportTest(vo);