From fbddeff093003a9e39fca07fdb6b815c4ab1f7b1 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Mon, 11 Mar 2024 16:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=92=8C=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/dao/ProjectDAO.java           |  4 ++--
 src/main/java/com/jsl/oa/mapper/ProjectMapper.java     | 10 +++++-----
 .../com/jsl/oa/services/impl/ProjectServiceImpl.java   |  3 ++-
 src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
index be19ea8..f635a2d 100644
--- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java
+++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
@@ -109,10 +109,10 @@ public class ProjectDAO {
         log.info("\t> 执行 DAO 层 ProjectDAO.get 方法");
         log.info("\t\t> 从 MySQL 获取数据");
         if(isFinish != null){
-            return projectMapper.getByIsfinish(isFinish);
+            return projectMapper.getByIsfinish(userId,isFinish);
         }
         if(tags != null && !tags.isEmpty()){
-            return projectMapper.getByTags(tags);
+            return projectMapper.getByTags(userId,tags);
         }
         if(listAll == 0) {
             return projectMapper.get(userId);
diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
index 4453bf9..4ce6b46 100644
--- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
@@ -43,15 +43,15 @@ public interface ProjectMapper {
 
     //@Select("select * from organize_oa.oa_project where json_extract(tags,'$.tags')" +
             //"like concat('%',#{tags},'%')")
-    @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false")
-    List<ProjectDO>getByIsfinish(Integer isFinish);
+    @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false and principal_id =#{userId}")
+    List<ProjectDO>getByIsfinish(Long userId,Integer isFinish);
 
-    List<ProjectDO>getByTags(List<String> tags);
+    List<ProjectDO>getByTags(Long userId,List<String> tags);
 
-    @Select("select * from organize_oa.oa_project where is_delete=false and status =1")
+    @Select("select * from organize_oa.oa_project where is_delete=false and status =1 and principal_id=#{userId}")
     List<ProjectDO> get(Long userId);
 
-    @Select("select * from organize_oa.oa_project where status =1 and status=1")
+    @Select("select * from organize_oa.oa_project where status =1 and status=1 and principal_id=#{userId}")
     List<ProjectDO> get1(Long userId);
 
     @Select("select * from organize_oa.oa_project where name=#{name}")
diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
index 9a914ea..3306c12 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
@@ -204,7 +204,8 @@ public class ProjectServiceImpl implements ProjectService {
             List<ProjectDO> projectDOList = projectDAO.get(userId,listAll,tags,isFinish);
             return ResultUtil.success(projectDOList);
         }else {
-            List<ProjectDO> projectDOList = projectDAO.get(userId,0,tags,isFinish);
+            listAll = 0;
+            List<ProjectDO> projectDOList = projectDAO.get(userId,listAll,tags,isFinish);
             return ResultUtil.success(projectDOList);
         }
 
diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
index 07cbe27..f443087 100644
--- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
@@ -51,7 +51,7 @@
         select * from organize_oa.oa_project where
         <foreach collection="tags" item="tag" separator=",'%') and json_extract(tags,'$.tags')like concat('%',"
                  open="json_extract(tags,'$.tags')like concat('%',"
-                 close=",'%') and is_delete=false">
+                 close=",'%') and is_delete=false and principal_id=#{userId}">
             #{tag}
         </foreach>
     </select>