From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 182 +++++++++++++++++++++++++++++----------------
1 files changed, 116 insertions(+), 66 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 2fe0c3a..6da776c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -33,6 +33,7 @@
<result column="cardid" property="cardid"/>
<result column="district" property="district"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="team" property="team"/>
</resultMap>
<resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
<result column="id" property="id"/>
@@ -81,7 +82,10 @@
and account like concat('%',#{user.account},'%')
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction like concat('%',#{user.jurisdiction},'%')
+ and (jurisdiction = #{user.jurisdiction} or workjurisdiction = #{user.jurisdiction})
+ </if>
+ <if test="user.workjurisdiction!=null and user.workjurisdiction != ''">
+ and workjurisdiction = #{user.workjurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat('%',#{user.realName},'%')
@@ -89,19 +93,25 @@
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
+ <if test="user.deptId!=null and user.deptId != ''">
+ and (jurisdiction = #{user.deptId} or workjurisdiction = #{user.deptId})
</if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and (role_id = #{user.roleId} )
+ </if>
+<!-- <if test="deptIdList!=null and deptIdList.size>0">-->
+<!-- and id in (-->
+<!-- SELECT-->
+<!-- user_id-->
+<!-- FROM-->
+<!-- blade_user_dept-->
+<!-- WHERE-->
+<!-- dept_id IN-->
+<!-- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">-->
+<!-- #{item}-->
+<!-- </foreach>-->
+<!-- )-->
+<!-- </if>-->
ORDER BY id
</select>
@@ -191,15 +201,31 @@
<select id="getUser" resultMap="userResultMap">
SELECT
- *
+ r.role_name as rolename,
+ u.*
FROM
- blade_user
+ blade_user u
+ LEFT JOIN blade_role r ON u.role_id = r.id
WHERE
- tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
+ u.tenant_id = #{param1} and u.account = #{param2} and u.password = #{param3} and u.is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
- SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+ SELECT u.id, u.tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id,
+ j.dept_name as fwfw,
+ w.dept_name as gzd FROM blade_user u
+ LEFT JOIN sys_jurisdiction j on j.id = u.jurisdiction
+ LEFT JOIN sys_jurisdiction w on w.id = u.workjurisdiction
+ where 1 = 1 and u.is_deleted = 0
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and (jurisdiction = #{user.jurisdiction} or workjurisdiction = #{user.jurisdiction})
+ </if>
+ <if test="user.workjurisdiction!=null and user.workjurisdiction != ''">
+ and workjurisdiction = #{user.workjurisdiction}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and real_name like concat('%',#{user.realName},'%')
+ </if>
</select>
<!--根据用户编号查询用户信息-->
@@ -263,59 +289,83 @@
<!-- 统计六大队伍数量 -->
<select id="getUserTypeCount" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">
SELECT
- '治保会队伍' AS region,
- count( * ) num
+ tj.`角色` as region,
+ COUNT(*) as num
FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
- WHERE
- dept.id = '1424615693403414529'
- UNION ALL
- SELECT
- '内保干部队伍' AS region,
- count( * ) num
+ (SELECT
+ blade_user.real_name AS "姓名",
+ blade_user.phone AS "电话",
+ blade_user.cardid AS "身份证",
+ blade_user.address AS "所属社区或单位",
+ blade_role.role_name AS "角色",
+ sys_jurisdiction.dept_name AS "服务范围",
+ s.dept_name AS "工作单位"
FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ (
+ blade_user
+ LEFT JOIN blade_role ON ( blade_user.role_id = blade_role.id )
+ LEFT JOIN sys_jurisdiction ON ( blade_user.jurisdiction = sys_jurisdiction.id )
+ LEFT JOIN sys_jurisdiction s ON ( blade_user.workjurisdiction = s.id )
+ )
WHERE
- dept.id = '1424615773594312705'
- UNION ALL
- SELECT
- '治安巡防队伍' AS region,
- count( * ) num
- FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
- WHERE
- dept.id = '1424615835435130881'
- UNION ALL
- SELECT
- '信息员队伍' AS region,
- count( * ) num
- FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
- WHERE
- dept.id = '1424615909959524354'
- UNION ALL
- SELECT
- '保安员队伍' AS region,
- count( * ) num
- FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
- WHERE
- dept.id = '1424615972718895106'
- UNION ALL
- SELECT
- '警务辅助队伍' AS region,
- count( * ) num
- FROM
- blade_user bu
- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
- WHERE
- dept.id = '1424616047083905026'
+ blade_user.is_deleted != 1) as tj
+ GROUP BY tj.`角色`
</select>
+<!-- <select id="getUserTypeCount" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">-->
+<!-- SELECT-->
+<!-- '治保会队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424615693403414529'-->
+<!-- UNION ALL-->
+<!-- SELECT-->
+<!-- '内保干部队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424615773594312705'-->
+<!-- UNION ALL-->
+<!-- SELECT-->
+<!-- '治安巡防队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424615835435130881'-->
+<!-- UNION ALL-->
+<!-- SELECT-->
+<!-- '信息员队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424615909959524354'-->
+<!-- UNION ALL-->
+<!-- SELECT-->
+<!-- '保安员队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424615972718895106'-->
+<!-- UNION ALL-->
+<!-- SELECT-->
+<!-- '警务辅助队伍' AS region,-->
+<!-- count( * ) num-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id-->
+<!-- WHERE-->
+<!-- dept.id = '1424616047083905026'-->
+<!-- </select>-->
<!-- 按辖区统计六大队伍数量 -->
<select id="getUserTypeCountXq" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">
--
Gitblit v1.9.3