From 6f2418c548b866d2973c4589c34f11808a165b3b Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Fri, 27 Jun 2025 22:25:40 +0800
Subject: [PATCH] 2025/6/27

---
 .../java/com/spring/modules/project/dao/ProjectDao.java   | 2 +-
 .../spring/modules/project/data/PlmProjectInfoData.java   | 8 --------
 .../modules/project/service/impl/ProjectServiceImpl.java  | 4 ++--
 src/main/resources/mapper/project/ProjectDao.xml          | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/spring/modules/project/dao/ProjectDao.java b/src/main/java/com/spring/modules/project/dao/ProjectDao.java
index 364a6663..32534d8a 100644
--- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java
+++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java
@@ -33,7 +33,7 @@ public interface ProjectDao extends BaseMapper<PlmProjectInfo> {
      * @return IPage<PlmProjectInfoData>
      * @throw
      */
-    IPage<PlmProjectInfoData> projectInfoSearch(Page<PlmProjectInfoData> page, @Param("query") PlmProjectInfoData inData);
+    IPage<PlmProjectInfoData> projectInfoSearch(Page<PlmProjectInfoData> page, @Param("query") PlmProjectInfoData inData, @Param("flag")boolean flag);
     IPage<PlmProjectInfoData> projectInfoSearchByAnyField(Page<PlmProjectInfoData> page,
                                                           @Param("params") Map<String, String>  params);
 
diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java
index 1a53af57..4d3f7bbe 100644
--- a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java
+++ b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java
@@ -35,15 +35,7 @@ public class PlmProjectInfoData extends PlmProjectInfo {
     private String toolNo;
     private String toolDesc;
     private String userId;
-    private String superFlag;
 
-    public String getSuperFlag() {
-        return superFlag;
-    }
-
-    public void setSuperFlag(String superFlag) {
-        this.superFlag = superFlag;
-    }
 
     public String getUserId() {
         return userId;
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 eef62a7d..b950c481 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
@@ -64,9 +64,9 @@ public class ProjectServiceImpl implements ProjectService {
 //            inData.setRoleId(1);
 //        }
         String superFlag = sysRoleDao.getSuperFlag(inData.getUserId());
-        inData.setSuperFlag(superFlag);
+        boolean shouldApplySuperFlagCondition = inData.getUserName() != null && !inData.getUserName().isEmpty() && !"Y".equals(superFlag);
         IPage<PlmProjectInfoData> resultList = this.projectDao.projectInfoSearch(
-                new Page<PlmProjectInfoData>(inData.getPage(), inData.getLimit()), inData);
+                new Page<PlmProjectInfoData>(inData.getPage(), inData.getLimit()), inData, shouldApplySuperFlagCondition);
 
         return new PageUtils(resultList);
     }
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index b3eb8275..1984fd44 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -110,7 +110,7 @@
 <!--            <if test="query.roleId != 1">-->
 <!--                AND project_id in ( select project_id from AccessProject where site=#{query.site} and username=#{query.userName} and searchFlag='Y' )-->
 <!--            </if>-->
-            <if test="query.userName != null  and query.userName != '' and query.superFlag != 'Y'">
+            <if test="flag">
                 AND project_id in ( select project_id from AccessProject where site=#{query.site} and username=#{query.userName} and searchFlag='Y' )
             </if>
             <if test="query.priority != null and query.priority != ''">