UPDATE:删除用户逻辑修改

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -134,8 +134,8 @@ public interface FsUserMapper
             "</script>"})
     List<FsUserExportListVO> selectFsUserExportListVO(FsUserParam fsUser);
 
-    @Update("update fs_user set is_del=1 where user_id=#{userId}")
-    int updateFsUserByUserId(Long userId);
+
+    int updateFsUserByUserId(@Param("userId") Long userId,@Param("remark")String remark);
 
     @Select("select f1.*,f2.nick_name tui_name,f2.phone tui_phone FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id where f1.user_id=#{userId} ")
     FsUserVO selectFsUserVoByUserId(Long userId);

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -26,10 +26,7 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.ImTypeEnum;
 import com.fs.common.param.LoginMaWxParam;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.DictUtils;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.*;
 import com.fs.company.cache.ICompanyTagCacheService;
 import com.fs.company.cache.ICompanyUserCacheService;
 import com.fs.company.domain.*;
@@ -279,7 +276,7 @@ public class FsUserServiceImpl implements IFsUserService {
     @Override
     public int deleteFsUserByUserIds(Long[] userIds) {
         for (Long userId : userIds) {
-            fsUserMapper.updateFsUserByUserId(userId);
+            fsUserMapper.updateFsUserByUserId(userId,null);
         }
         return userIds.length;
     }
@@ -292,7 +289,8 @@ public class FsUserServiceImpl implements IFsUserService {
      */
     @Override
     public int deleteFsUserByUserId(Long userId) {
-        return fsUserMapper.updateFsUserByUserId(userId);
+        String username = SecurityUtils.getUsername()+"删除了用户";
+        return fsUserMapper.updateFsUserByUserId(userId,username);
     }
 
     /**

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -746,6 +746,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePasswordByPhone">
         update fs_user set password = #{password} where phone = #{encryptPhone}
     </update>
+    <update id="updateFsUserByUserId">
+        update fs_user set is_del=1
+                       <if test="remark != null and remark != ''">
+                           ,remark = #{remark}
+                       </if>
+                       where user_id=#{userId}
+    </update>
 
     <select id="selectUserListByMap" resultType="com.fs.his.vo.OptionsVO">
         select