From 1da2e1b9bbc5dbcb5dac1c427375c64ab32595cf Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 20:35:43 +0800
Subject: [PATCH] 设置用户去除admin

---
 project-system/src/main/resources/mapper/system/SysUserMapper.xml |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/project-system/src/main/resources/mapper/system/SysUserMapper.xml b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0e54a13..3cc2e3a 100644
--- a/project-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -69,7 +69,7 @@
 		       u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,d.dept_name, d.leader
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
+		where u.del_flag = '0' and u.user_name!='admin'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
@@ -92,7 +92,7 @@
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
-		<if test="params != null and params.dataScope != null">
+		<if test="params != null and params.dataScope != null and params.dataScope != ''">
 			AND ${params.dataScope}
 		</if>
 	</select>
@@ -111,7 +111,7 @@
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
-		<if test="params != null and params.dataScope != null">
+		<if test="params != null and params.dataScope != null and params.dataScope != ''">
 			AND ${params.dataScope}
 		</if>
 	</select>
@@ -131,7 +131,7 @@
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
-		<if test="params != null and params.dataScope != null">
+		<if test="params != null and params.dataScope != null and params.dataScope != ''">
 			AND ${params.dataScope}
 		</if>
 	</select>
@@ -229,6 +229,10 @@
  		update sys_user set password = #{password}, recommend_user = #{recommendUser} where user_name = #{userName}
 	</update>
 
+	<update id="resetPhone" parameterType="SysUser">
+		update sys_user set phonenumber = #{phone}, user_name = #{phone} where user_id = #{userId}
+	</update>
+
 	<delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '1' where user_id = #{userId}
  	</delete>
@@ -245,11 +249,13 @@
 		select u.phonenumber
 			from sys_user u
 			join sys_user_role ur on u.user_id = ur.user_id
-			join sys_role r on r.role_id=ur.role_id
+			join sys_role r on r.role_id = ur.role_id
+			join sys_user_dept ud on u.user_id = ud.user_id
 		where
 		  u.user_type != '02'
+		  and u.status='0'
 		  and r.role_key = #{roleKey}
-		  and u.dept_id = #{deptId}
+		  and ud.dept_id = #{deptId}
 	</select>
 
 </mapper>

--
Gitblit v1.9.1