修改员工档案时开启用户状态可用

zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/user/AdminUserApi.java

@@ -145,6 +145,13 @@ public interface AdminUserApi {
     @Operation(summary = "编辑用户部门关联关系")
     CommonResult<Boolean> updateUserDept(@Valid @RequestBody UserUpdateDTO dto);
 
+    /**
+     * 账号开启
+     * */
+    @PostMapping(PREFIX + "openUser")
+    @Operation(summary = "编辑用户部门关联关系")
+    CommonResult<Boolean> openUser(@RequestParam("userId") String userId);
+
     /**
      * 账号关闭
      */

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/api/user/AdminUserApiImpl.java

@@ -155,12 +155,22 @@ public class AdminUserApiImpl implements AdminUserApi {
     public CommonResult<Boolean> updateUserDept(UserUpdateDTO dto) {
         userService.updateUserDept(dto);
         //离职状态关闭账号
-        if (StrUtil.isNotEmpty(dto.getState()) && "4".equals(dto.getState())) {
-            closeUser(dto.getUserId());
+        if (StrUtil.isNotEmpty(dto.getState())) {
+            if("4".equals(dto.getState())){
+                closeUser(dto.getUserId());
+            }else{
+                openUser(dto.getUserId());
+            }
         }
         return success(true);
     }
 
+    @Override
+    public CommonResult<Boolean> openUser(String userId) {
+        userService.openUser(userId);
+        return success(true);
+    }
+
     @Override
     public CommonResult<Boolean> closeUser(String userId) {
         userService.closeUser(userId);

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserService.java

@@ -276,6 +276,11 @@ public interface AdminUserService {
      */
     String createUserAndDeptPost(UserBaseDTO dto);
 
+    /**
+     * 开启用户账号
+     * **/
+    void openUser(String userId);
+
     /**
      * 关闭用户账号
      */

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -622,6 +622,16 @@ public class AdminUserServiceImpl implements AdminUserService {
         return userId;
     }
 
+    @Override
+    public void openUser(String userId) {
+        AdminUserDO user = userMapper.selectById(userId);
+        if (user == null) {
+            throw exception(USER_NOT_EXISTS);
+        }
+        user.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        userMapper.updateById(user);
+    }
+
     @Override
     public void closeUser(String userId) {
         AdminUserDO user = userMapper.selectById(userId);