From 053f6187b5f6cda1725ed63df8a8766b5976fb53 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 八月 2025 09:01:35 +0800
Subject: [PATCH] 菌种库所有代码

---
 ruoyi-system/target/classes/mapper/system/SysUserMapper.xml |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
index 0c39855..f844487 100644
--- a/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
@@ -134,7 +134,7 @@
 		select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
 			   u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
 			   u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
-			   u.roleType,
+			   u.roleType,u.sign_picture as signPicture,
 			   ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
 		from sys_user u
 		left join sys_user_role ur on u.user_id = ur.user_id
@@ -265,23 +265,29 @@
 	<select id="choiceUserList" resultType="com.ruoyi.system.vo.ChoiceUserVO">
 		select * from sys_user
 
-		where status =  0 and del_flag = 0
-		  and roleType = #{query.roleType}
-		<if test="query.userIds != null and query.userIds()>0">
+		where status =  '0' and del_flag = '0'
+		<if test="query.userIds != null and query.userIds.size()>0">
 			AND user_id IN
 			<foreach collection="query.userIds" close=")" open="(" item="id" separator=",">
 				#{id}
 			</foreach>
+		</if>
+		<if test="query.nickNameOrPhone != null and query.nickNameOrPhone != ''">
+			and( nick_name LIKE concat('%', #{query.nickNameOrPhone}, '%') or phonenumber LIKE concat('%', #{query.nickNameOrPhone}, '%')
+			)
 		</if>
 	</select>
 	<select id="selectUserByUserNameLike" resultType="com.ruoyi.common.core.domain.entity.SysUser">
 		select * from sys_user
 		where 1=1
 				<if test="userName != null and userName != ''">
-					OR nick_name LIKE concat('%', #{userName}, '%')
+					and nick_name LIKE concat('%', #{userName}, '%')
 				</if>
 
 	</select>
+	<update id="editSignPicture" parameterType="SysUser">
+		update sys_user set sign_picture = #{signPicture} where user_id = #{userId}
+	</update>
 
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -375,7 +381,7 @@
 	</update>
 
     <delete id="deleteUserById" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id = #{userId}
+ 		delete sys_user  where user_id = #{userId}
  	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">

--
Gitblit v1.7.1