From 5e1da6b0793efbdff85daf1d78df8b2cf6378361 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Sun, 17 Mar 2024 08:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/mapper/ModuleMapper.java           | 4 ++++
 .../java/com/jsl/oa/services/impl/ModuleServiceImpl.java    | 6 ++++--
 src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/jsl/oa/mapper/ModuleMapper.java b/src/main/java/com/jsl/oa/mapper/ModuleMapper.java
index 15b638c..02e7f90 100644
--- a/src/main/java/com/jsl/oa/mapper/ModuleMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/ModuleMapper.java
@@ -29,4 +29,8 @@ public interface ModuleMapper {
 
     @Select("select * from organize_oa.oa_project_work where pid=#{id} and is_delete=0 and type=1 ")
     List<ProjectWorkDO> getAllMoudleByPid(Long id);
+
+    @Select("select principal_id from organize_oa.oa_project where id=(select project_id " +
+            "from organize_oa.oa_project_work where oa_project_work.id = #{sysId})")
+    Long getPridBySysyid(Integer sysId);
 }
diff --git a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
index c6fd892..f8138e3 100644
--- a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
@@ -52,9 +52,11 @@ public class ModuleServiceImpl implements ModuleService {
         Long userId = Processing.getAuthHeaderToUserId(request);
         //获取子系统负责人id
         Long pid = moduleMapper.getPidBySysid(sysId);
-        //判断是否是子系统负责人
+        //获取项目负责人id
+        Long prid = moduleMapper.getPridBySysyid(sysId);
+        //判断是否是子系统/项目负责人
         int is = 1;
-        if(!pid.equals(userId)){
+        if(!pid.equals(userId) && !prid.equals(userId)){
             is = 0;
         }
 
diff --git a/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml b/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml
index 9d6f6fa..cedd210 100644
--- a/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml
@@ -15,7 +15,7 @@
     <select id="getBySysId" resultType="com.jsl.oa.model.doData.ProjectWorkDO">
         select * from organize_oa.oa_project_work where pid=#{sysId} and type=1
         <if test="is != 1 ">
-            and principal_id=#{userId}
+            and (principal_id=#{userId} or principal_id is null)
         </if>
     </select>
 </mapper>
\ No newline at end of file