From b64663bf37fd4e2f701c3a1dc2fec0e0e973ffb2 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 26 Mar 2025 16:50:41 +0800
Subject: [PATCH] 2025-03-26

---
 .../service/impl/ProjectServiceImpl.java      | 30 +++++++++----------
 .../resources/mapper/project/ProjectDao.xml   |  7 +++--
 2 files changed, 20 insertions(+), 17 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 01b91578..b5386b79 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
@@ -47,13 +47,13 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public PageUtils projectInfoSearch(PlmProjectInfoData inData){
-        List<Long> list = sysRoleService.findRoleIdByUsername(inData.getUserName(),1);
-        // 超级管理员角色 ID 1
-        // 判断用户是否是超级管理员
-        if (!list.isEmpty()){
-            // 存在角色编码为1的 即存在超级管理员
-            inData.setRoleId(1);
-        }
+//        List<Long> list = sysRoleService.findRoleIdByUsername(inData.getUserName(),1);
+//        // 超级管理员角色 ID 1
+//        // 判断用户是否是超级管理员
+//        if (!list.isEmpty()){
+//            // 存在角色编码为1的 即存在超级管理员
+//            inData.setRoleId(1);
+//        }
         IPage<PlmProjectInfoData> resultList = this.projectDao.projectInfoSearch(
                 new Page<PlmProjectInfoData>(inData.getPage(), inData.getLimit()), inData);
 
@@ -66,14 +66,14 @@ public class ProjectServiceImpl implements ProjectService {
                                                       String projectName,
                                                       String customerId){
 
-        SysUserEntity user = (SysUserEntity)SecurityUtils.getSubject().getPrincipal();
-        List<Long> list = sysRoleService.findRoleIdByUsername(user.getUsername(),1);
-        // 超级管理员角色 ID 1
-        // 判断用户是否是超级管理员
-        if (!list.isEmpty()){
-            return projectDao.selectProjectInfoList(site,projectId,projectName,customerId);
-        }
-        return projectDao.selectProjectInfoListSys(site,projectId,projectName,user.getUsername(),customerId);
+//        SysUserEntity user = (SysUserEntity)SecurityUtils.getSubject().getPrincipal();
+//        List<Long> list = sysRoleService.findRoleIdByUsername(user.getUsername(),1);
+//        // 超级管理员角色 ID 1
+//        // 判断用户是否是超级管理员
+//        if (!list.isEmpty()){
+//
+//        }
+        return projectDao.selectProjectInfoList(site,projectId,projectName,customerId);
     }
 
     @Override
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index d6efe7f9..7168bd7d 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -104,7 +104,10 @@
             <if test="query.projectOwnerName != null and query.projectOwnerName != ''">
                 AND dbo.get_projectTeamName(site,project_id,'owner') like #{query.projectOwnerName}
             </if>
-            <if test="query.roleId != 1">
+<!--            <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.userName != 'admin'">
                 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 != ''">
@@ -742,7 +745,7 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
         productSet
         FROM plm_project_info
         <where>
-            AND project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
+<!--            AND project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )-->
             <if test="site != null and site != ''">
                 AND site = #{site}
             </if>