更新！

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/UserAccountService.java

@@ -39,6 +39,8 @@ public interface UserAccountService {
     // 得到平台用户详情
     ResultContent<OrganizationUserModel> getOrgUserDetail(OrgUserDetailParam param);
 
+    ResultContent deleteUser(UserIdModel param);
+
     // 删除机构用户
     ResultContent deleteOrgUser(DelUserCountParam param);
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserManagerController.java

@@ -1,15 +1,14 @@
 package com.zhongshu.card.server.core.controller.user;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.base.UserIdModel;
-import com.zhongshu.card.client.model.org.*;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.service.org.OrganizationService;
+import com.zhongshu.card.client.model.base.UserIdModel;
+import com.zhongshu.card.client.model.org.DelUserCountParam;
+import com.zhongshu.card.client.model.org.UpdateUserStateParam;
+import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.model.org.UserCountSearchParam;
 import com.zhongshu.card.client.service.org.UserAccountService;
-import com.zhongshu.card.server.core.service.org.IndexService;
-import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -33,7 +31,14 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserManagerController {
 
     @Autowired
-    UserAccountService userAccountService;
+    private UserAccountService userAccountService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除用户（所有的）", description = "删除用户")
+    @RequestMapping(value = {"deleteUser"}, method = {RequestMethod.POST})
+    public ResultContent deleteUser(@RequestBody UserIdModel param) {
+        return userAccountService.deleteUser(param);
+    }
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "删除机构用户", description = "删除机构用户")
@@ -50,7 +55,7 @@ public class UserManagerController {
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "平台修改用户信息", description = "平台修改用户信息")
+    @Operation(summary = "超管修改用户状态", description = "超管修改用户状态")
     @RequestMapping(value = {"updateUserState"}, method = {RequestMethod.POST})
     public ResultContent updateUserState(@RequestBody UpdateUserStateParam param) {
         return userAccountService.updateUserState(param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/OrganizationUserDao.java

@@ -66,4 +66,6 @@ public interface OrganizationUserDao extends MongoDao<OrganizationUser>, Organiz
     void deleteByOrganization(Organization organization);
 
     void deleteByProjectOid(String projectOid);
+
+    void deleteByUserId(String userId);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -250,6 +250,17 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return ResultContent.buildSuccess(model);
     }
 
+    public ResultContent deleteUser(UserIdModel param) {
+        UserAccount userAccount = userCountDao.findTopByUserId(param.getUserId());
+        if (ObjectUtils.isEmpty(userAccount)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getUserId()));
+        }
+        // 删除所有的机构
+        organizationUserDao.deleteByUserId(param.getUserId());
+        userCountDao.delete(userAccount);
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 删除机构用户
      *
@@ -305,15 +316,16 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             if (StringUtils.isEmpty(param.getPhone())) {
                 return ResultContent.buildFail("phone不能为空");
             }
-            if (StringUtils.isEmpty(param.getPassword())) {
+            String password = param.getPassword();
+            if (StringUtils.isEmpty(password)) {
                 return ResultContent.buildFail("password不能为空");
             }
-            ValidateResult validateResult = ValidateUtils.validatePassWord(param.getPassword());
+            ValidateResult validateResult = ValidateUtils.validatePassWord(password);
             if (!validateResult.isSuccess()) {
                 return ResultContent.buildFail(validateResult.getMsg());
             }
             userAccountParam.setLoginName(param.getPhone());
-            userAccountParam.setPassword(param.getPassword());
+            userAccountParam.setPassword(password);
             userAccountParam.setPhone(param.getPhone());
         } else {
             userId = param.getUserId();