Merge branch 'main' of ssh://124.243.245.42:2222/zkr/shz-backend

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.del_flag='0' and u.user_id = #{userId}
+		where u.user_id = #{userId}
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -306,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="idCard != null">id_card = #{idCard},</if>
 			<if test="lcUserid != null">lc_userid = #{lcUserid},</if>
+			<if test="delFlag != null">del_flag = #{delFlag},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}