From 1f71a273c29432665a93507211e9168e51ac4d3f Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 29 五月 2024 13:59:10 +0800
Subject: [PATCH] 光电查询加入自定义权限修改提交
---
ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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..5d0cf84 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" />
@@ -18,6 +18,19 @@
<result property="updateTime" column="update_time" />
<!-- 瀛愭煡璇紝鍏宠仈 ard_dispatch_police_user 琛� -->
<collection property="sysUserList" ofType="java.util.List" select="getSysUserListByMainTableId" column="id"/>
+ </resultMap>
+ <resultMap type="ArdWall" id="ArdWallOnlyResult">
+ <result property="id" column="id" />
+ <result property="wallName" column="wall_name" />
+ <result property="wallPoi" column="wall_poi" />
+ <result property="type" column="type" />
+ <result property="color" column="color" />
+ <result property="deptId" column="dept_id" />
+ <result property="userId" column="user_id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
</resultMap>
<select id="getSysUserListByMainTableId" resultType="SysUser">
SELECT u.*
@@ -42,8 +55,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 +141,18 @@
#{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>
+ <select id="getArdWallListByUserId" parameterType="java.lang.String" resultMap="ArdWallOnlyResult">
+ select aw.* from ard_wall_user awu
+ inner join ard_wall aw on awu.wall_id = aw.id
+ where awu.user_id = #{userId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3