From 858ddcd71b737c1e2d9f9c1fb9d009209cb97b4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 22 Feb 2024 16:47:26 +0800
Subject: [PATCH] 场所检查新增场所类型查询，安全自查查询调整，新增安全自查导出
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index a3e9195..4433989 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -98,7 +98,7 @@
jd.id = #{districtId}
and bu.is_deleted = '0'
and jh.is_deleted = '0'
-
+ and jh.role_type = '1'
</select>
<!--根据手机号查询对应账号和手机号的用户信息-->
@@ -109,8 +109,8 @@
<!--用户详情map-->
<resultMap id="selectUserDetailMap" type="org.springblade.modules.system.vo.UserDetailVO" autoMapping="true">
- <id property="id" column="id" />
- <collection property="deptList" javaType="java.util.List"
+ <id property="id" column="id"/>
+ <collection property="deptList" javaType="java.util.List"
ofType="org.springblade.modules.system.vo.DeptDetailVO" autoMapping="true">
<id property="id" column="cid"/>
<id property="level" column="region_level"/>
@@ -224,7 +224,8 @@
( SELECT id, parent_id FROM blade_dept ORDER BY parent_id, id ) org_query,
(SELECT @id := #{deptId} ) initialisation
WHERE
- FIND_IN_SET( parent_id, @id ) > 0 AND @id := CONCAT( @id, ',', id )
+ (FIND_IN_SET( parent_id, @id ) > 0 or FIND_IN_SET( id, @id ) > 0)
+ AND @id := CONCAT( @id, ',', id )
)
</select>
--
Gitblit v1.9.3