From 3955c6d7cdc8a3b6f1bd31a249a2c562820adfcb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 13:08:24 +0800
Subject: [PATCH] 消息通知完善

---
 src/main/resources/mapper/system/SysUserMapper.xml |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index f77e62c..441fd9a 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,7 +27,7 @@
         <association property="dept"    javaType="com.ruoyi.project.system.domain.SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="com.ruoyi.project.system.domain.SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -37,7 +37,7 @@
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="com.ruoyi.project.system.domain.SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -46,7 +46,7 @@
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<sql id="selectUserVo">
         select u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_id
@@ -54,7 +54,7 @@
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
 		select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
 		left join
@@ -97,7 +97,7 @@
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id,  u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -113,7 +113,7 @@
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -130,25 +130,25 @@
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
@@ -179,6 +179,12 @@
 		<foreach collection="userIds" item="id" open="(" separator="," close=")">
 			#{id}
 		</foreach>
+	</select>
+	<select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
+			parameterType="java.lang.String">
+		<include refid="selectUserVo"/>
+		where u.nick_name = #{nickName} and u.del_flag = '0'
+		limit 1
 	</select>
 
 	<insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -214,7 +220,7 @@
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="com.ruoyi.project.system.domain.SysUser">
  		update sys_user
  		<set>
@@ -234,28 +240,64 @@
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="com.ruoyi.project.system.domain.SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="com.ruoyi.project.system.domain.SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="com.ruoyi.project.system.domain.SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
-</mapper> 
\ No newline at end of file
+
+	<select id="getUserByRole" resultType="java.lang.Long">
+		select distinct su.user_id
+		from sys_user su
+				 left join sys_user_role sur on su.user_id = sur.user_id
+				 left join sys_role sr on sur.role_id = sr.role_id
+		where role_name like concat('%', #{role}, '%')
+		  and sr.del_flag = '0'
+		  and sr.status = '0'
+		  and su.status = '0'
+		  and su.del_flag = '0'
+	</select>
+	<select id="getUserByPerms" resultType="java.lang.Long">
+		select distinct t5.user_id
+		from sys_role_menu t1
+		left join sys_menu t2 on t1.menu_id = t2.menu_id
+		left join sys_role t3 on t1.role_id = t3.role_id
+		inner join sys_user_role t4 on t4.role_id = t3.role_id
+		inner join sys_user t5 on t5.user_id = t4.user_id
+		where t3.del_flag = '0'
+		and t2.perms is not null
+		and t2.perms &lt;&gt; ''
+		and t5.del_flag = '0'
+		and t5.status = '0'
+		and t3.status = '0'
+		<if test="perms != null and perms.size() > 0">
+			AND (
+			<foreach collection="perms" item="p" separator=" OR ">
+				t2.perms = #{p}
+				OR t2.perms = (split_part(#{p}, ':', 1) || ':' || split_part(#{p}, ':', 2) || ':*')
+				OR t2.perms = (split_part(#{p}, ':', 1) || ':*:*')
+			</foreach>
+			OR t2.perms = '*:*:*'
+			)
+		</if>
+	</select>
+
+</mapper>

--
Gitblit v1.9.3