From ffb7c59cadfb8a043a41849fd6d093f7967ea4cb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 06 八月 2026 10:24:59 +0800
Subject: [PATCH] feat(quality): 增加不合格品拒收处理功能
---
src/main/resources/mapper/system/SysUserMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index ea68745..cb3681e 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -97,7 +97,7 @@
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
- ORDER BY u.create_time DESC
+ ORDER BY u.create_time DESC, u.user_id DESC
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
@@ -131,20 +131,20 @@
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
- ORDER BY u.create_time DESC
+ ORDER BY u.create_time DESC, u.user_id DESC
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_name = #{userName} and u.del_flag = '0'
- ORDER BY u.create_time DESC
+ ORDER BY u.create_time DESC, u.user_id DESC
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
and u.del_flag = '0'
- ORDER BY u.create_time DESC
+ ORDER BY u.create_time DESC, u.user_id DESC
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -169,7 +169,7 @@
</if>
and u.del_flag = '0'
</where>
- ORDER BY u.create_time DESC
+ ORDER BY u.create_time DESC, u.user_id DESC
</select>
<select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name FROM sys_user
@@ -184,7 +184,7 @@
1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
</if>
</where>
- ORDER BY sys_user.create_time DESC
+ ORDER BY sys_user.create_time DESC, sys_user.user_id DESC
</select>
<select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name
@@ -194,7 +194,7 @@
#{id}
</foreach>
and del_flag = '0'
- ORDER BY sys_user.create_time DESC
+ ORDER BY sys_user.create_time DESC, sys_user.user_id DESC
</select>
<select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
parameterType="java.lang.String">
@@ -266,6 +266,9 @@
<update id="resetUserPwd" parameterType="com.ruoyi.project.system.domain.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
+ <update id="resetAllUserPwd">
+ update sys_user set password = #{password} where del_flag = '0'
+ </update>
<delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
@@ -288,7 +291,7 @@
and sr.status = '0'
and su.status = '0'
and su.del_flag = '0'
- ORDER BY su.create_time DESC
+ ORDER BY su.create_time DESC, su.user_id DESC
</select>
<select id="getUserByPerms" resultType="java.lang.Long">
select distinct t5.user_id
--
Gitblit v1.9.3