From b1d76ff75fef33e8b2307f3a8c2f4ec5e638f0cd Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 02 Nov 2024 14:45:08 +0800
Subject: [PATCH] 湖北水库:项目单位过滤

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
index e82942b..84ae035 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
@@ -31,14 +31,18 @@
             --   d.id as device_id,
             --   d.device_name
             , sppc.user_id
+            , sppc.id
             , bu.real_name as userName
         FROM
             ywxt.sg_project_info pro
-                LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
-                Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type
+                inner JOIN ywxt.sg_device d ON pro.id = d.program_id
+                Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type or sgc.gx_device_type in ('cldw','sgys')
                 left join ywxt.blade_role ro on	ro.id = sgc.role_id
-                left join ywxt.sg_project_person_config sppc on sppc.rold_id = sgc.role_id
+                left join ywxt.sg_project_person_config sppc  on sgc.role_id = sppc.rold_id and sppc.program_id = pro.id
                 left join ywxt.blade_user bu on sppc.user_id = bu.id
         where 1=1 and pro.id = #{dto.projectId}
     </select>
+    <select id="getUserByRole" resultType="java.util.Map">
+        select id,real_name as realName from ywxt.blade_user where role_id = #{roleId}
+    </select>
 </mapper>

--
Gitblit v1.9.3