From 4efb5912fef2255982779b5b4b271565e659b146 Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 26 Jun 2025 17:01:12 +0800
Subject: [PATCH] 2025/6/26

---
 .../com/spring/modules/base/controller/BaseController.java     | 1 -
 src/main/resources/mapper/project/ProjectDao.xml               | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java
index a505e1a4..18716be7 100644
--- a/src/main/java/com/spring/modules/base/controller/BaseController.java
+++ b/src/main/java/com/spring/modules/base/controller/BaseController.java
@@ -613,7 +613,6 @@ public class BaseController extends AbstractController {
 
     @PostMapping(value = "/getSiteList")
     @ResponseBody
-//    public R getSiteList(@RequestBody SiteVoData inData){
     public R getSiteList(SiteVoData inData){
         List<SiteVoData> rows = baseService.getSiteList(inData);
         return R.ok().put("rows",rows);
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 470d3451..f6cd2ad8 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -48,6 +48,9 @@
             <if test="customerId != null and customerId != ''">
                 AND customer_id like #{customerId}
             </if>
+            <if test="userName != null and userName != '' userName!= 'admin'">
+                AND (dbo.get_projectUserRoleName(site, project_id) like '%'+#{userName}+';%' or dbo.get_projectUserRoleName(site, project_id) like '%' + #{userName})
+            </if>
         </where>
         order by LEFT(project_id, CHARINDEX('-', project_id + '-') - 1) desc
     </select>