From 990782ab2c75805ef0390e40255ca817a02aa0bd Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 16 十月 2023 10:35:49 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
index 53d55fe..5711613 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.alarmpoints.elecwall.mapper.ArdWallMapper">
+<mapper namespace="com.ruoyi.alarmpoints.wall.mapper.ArdWallMapper">
<resultMap type="ArdWall" id="ArdWallResult">
<result property="id" column="id" />
@@ -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