From 746ddee34a16539fc0626f9915408b6f50ea275a Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Fri, 15 Mar 2024 18:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java | 1 +
 src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 161d0e9..c6fd892 100644
--- a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
@@ -37,6 +37,7 @@ public class ModuleServiceImpl implements ModuleService {
         //判断是否是项目负责人
         int is = 1;
         if(!pid.equals(userId)){
+            log.info("不是负责人");
             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 97ce40d..9d6f6fa 100644
--- a/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml
@@ -8,7 +8,7 @@
     <select id="getByProjectId" resultType="com.jsl.oa.model.doData.ProjectWorkDO">
         select * from organize_oa.oa_project_work where project_id=#{projectId} and type=0
         <if test="is != 1 ">
-            and principal_id=#{userId}
+            and (principal_id=#{userId} or principal_id is null)
         </if>
     </select>