From d5bf846770b001cac64ca27a3fe2886a9c5076b3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
index ac04b1d..8aa82dc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
@@ -271,16 +271,16 @@
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	
-	<delete id="deleteUserById" parameterType="Long">
+	<update id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
- 	</delete>
+ 	</update>
  	
- 	<delete id="deleteUserByIds" parameterType="Long">
+ 	<update 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> 
- 	</delete>
+ 	</update>
 	<delete id="deleteSysUser">
 		delete from sys_user where user_id in
 		<foreach collection="userIds" separator="," open="(" item="id" close=")" >

--
Gitblit v1.7.1