|
|
@@ -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)) {
|