From 4735de8558c67deb76b192cc954ef81e45428d92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 22 九月 2023 11:07:40 +0800
Subject: [PATCH] 设备健康

---
 ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
index da756a4..5711613 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
@@ -42,8 +42,10 @@
             <if test="wallPoi != null  and wallPoi != ''"> and wall_poi = #{wallPoi}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="color != null  and color != ''"> and color = #{color}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="deptId != null ">and (dept_id = #{deptId} OR dept_id IN ( SELECT t.dept_id FROM sys_dept t
+                WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+            </if>
         </where>
     </select>
     
@@ -126,4 +128,13 @@
             #{wallId}
         </foreach>
     </delete>
+    <select id="selectArdWallListByUserId" parameterType="String"  resultMap="ArdWallResult">
+        SELECT
+            aw.*
+        FROM
+            ard_wall aw
+                LEFT JOIN ard_wall_user awu ON awu.wall_id = aw.ID
+        WHERE
+            awu.user_id =  #{userId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3