人员管理问题调整

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -711,7 +711,7 @@ public class SysUserController extends BaseController {
     })
     @Transactional
     public HttpResult updateUserInfo(@PathVariable String userId, @RequestBody SysUser2Vo sysUserVo) {
-        return HttpResult.ok(sysUserService.updateUserInfo(userId, sysUserVo));
+        return sysUserService.updateUserInfo(userId, sysUserVo);
     }
 
 

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -2,9 +2,11 @@ package com.ydtech.modules.admin.model;
 
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.model.BaseEntity;
@@ -17,6 +19,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.Date;
 
 /**
  * 用户
@@ -137,6 +140,11 @@ public class SysUser extends BaseEntity {
     @Excel(name = "状态")
     private String excelStatus;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "离职时间")
+    @TableField(value = "logout_time")
+    private Date logoutTime;
+
     @TableField(exist = false)
     @Excel(name = "推荐人ID")
     private String referrerId;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -378,6 +378,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public HttpResult saveUserInfo(SysUser2Vo sysUserVo) {
 
         SysUser sysUser = sysUserVo.getSysUser();
+        //处理密码
+        if (StringUtils.isNotEmpty(sysUser.getPassword())) {
+            String salt = PasswordUtils.getSalt();
+            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
+            sysUser.setPassword(pwd);
+            sysUser.setSalt(salt);
+        } else {
+            return HttpResult.error("密码不能为空");
+        }
         String userId = gainNextUserId(sysUser.getDeptId());
         sysUser.setId(userId);
         save(sysUser);
@@ -425,7 +434,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUser.setPassword(pwd);
             sysUser.setSalt(salt);
         } else {
-            sysUser.setPassword(null);
+            return HttpResult.error("密码不能为空");
+        }
+        //删除状态必须有离司时间
+        if(StringUtils.isNotEmpty(sysUser.getStatus().toString())){
+            if(sysUser.getStatus()==0&& sysUser.getLogoutTime()==null){
+                return HttpResult.error("删除状态，离职时间必填");
+            }
+        }else{
+            return HttpResult.error("状态不能为空");
         }
         updateById(sysUser);