From 97e90b1b3c4fb213e3b75d1fcabd0e40cd2cb311 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 23 Jul 2024 09:15:13 +0800
Subject: [PATCH] 2024-06-21

---
 .../project/service/impl/ProjectServiceImpl.java       |  5 ++++-
 src/main/resources/mapper/base/BaseMapper.xml          |  2 +-
 src/main/resources/mapper/project/ProjectDao.xml       | 10 +++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
index 12d88997..24087f20 100644
--- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
@@ -89,7 +89,10 @@ public class ProjectServiceImpl implements ProjectService {
             }else {
                 list.get(i).setDeleteCheck(false);
             }
-            if("Y".equals(list.get(i).getSearchFlag())&&"Y".equals(list.get(i).getUpdateFlag())&&"Y".equals(list.get(i).getDownFlag())&&"Y".equals(list.get(i).getDeleteFlag())){
+            if("Y".equals(list.get(i).getSearchFlag())
+                    && "Y".equals(list.get(i).getUpdateFlag())
+                    && "Y".equals(list.get(i).getDownFlag())
+                    && "Y".equals(list.get(i).getDeleteFlag())){
                 list.get(i).setCheckAll(true);
             }else {
                 list.get(i).setCheckAll(false);
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 738d7a31..e09e48b1 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -283,7 +283,7 @@
             b.need_date
         FROM
             AccessProject a
-                LEFT JOIN plm_project_info b ON a.site = b.site
+                Inner JOIN plm_project_info b ON a.site = b.site
                 AND a.project_id = b.project_id
         WHERE
             a.username = #{username}
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 932bb68e..fc17e359 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -107,7 +107,15 @@
     left join AccessSite b on a.username = b.UserID
     left join AccessProject c on a.username = c.username and c.project_id = #{projectId} and c.site = #{site}
     <where>
-        and b.site = #{site}
+        <if test="site != null and site != ''">
+            and b.site = #{site}
+        </if>
+        <if test="username != null and username != ''">
+            and a.username like #{username}
+        </if>
+        <if test="userDisplay != null and userDisplay != ''">
+            and a.user_display like #{userDisplay}
+        </if>
     </where>
 </select>