浏览代码

更新!

TRX 1 年之前
父节点
当前提交
2d7e860ba0

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

@@ -34,7 +34,7 @@ public class UserManagerController {
     private UserAccountService userAccountService;
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "删除用户(所有的)", description = "删除用户")
+    @Operation(summary = "删除用户(所有的结构及用户基本信息)", description = "删除用户")
     @RequestMapping(value = {"deleteUser"}, method = {RequestMethod.POST})
     public ResultContent deleteUser(@RequestBody UserIdModel param) {
         return userAccountService.deleteUser(param);

+ 4 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -255,6 +255,9 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         if (ObjectUtils.isEmpty(userAccount)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getUserId()));
         }
+        //todo 判断是否可以删除
+
+
         // 删除所有的机构
         organizationUserDao.deleteByUserId(param.getUserId());
         userCountDao.delete(userAccount);
@@ -656,6 +659,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             oid = getCurrentOid();
         }
         Page<UserAccount> page = userCountDao.page(pageable, param);
+
         List<UserCountAboutRoleModel> models = new ArrayList<>();
         List<UserAccount> list = page.getContent();
         if (ObjectUtils.isNotEmpty(list)) {