|
@@ -91,8 +91,12 @@ public class UserService {
|
|
|
if(ObjectUtil.isNull(userPO.getId())){
|
|
|
ParameterVO parameter = parameterService.getParameterByUserId();
|
|
|
int num = parameter.getNumCreateUser();//最大用户数
|
|
|
+ int subUserNum = 0;
|
|
|
String userId = AuthUtil.getCurrentUserId();
|
|
|
- int subUserNum = userMapper.getSubUserNum(userId);
|
|
|
+ List<UserPO> subUsers = userMapper.getSubUser(userId);
|
|
|
+ if(ObjectUtil.isNotNull(subUsers)){
|
|
|
+ subUserNum = subUsers.size();
|
|
|
+ }
|
|
|
if(subUserNum >= num ){
|
|
|
userPO.setId("subUserNum");
|
|
|
return userPO;
|
|
@@ -140,7 +144,20 @@ public class UserService {
|
|
|
userMapper.saveVisible(userPO);
|
|
|
if("1".equals(userPO.getVisible())){
|
|
|
logService.logUser(LogConstants.SYS_LOG_USER_START,userPO);
|
|
|
- }else{
|
|
|
+ }else{//停用
|
|
|
+ UserVO userInfo = userMapper.getUserInfo(userPO.getId());
|
|
|
+ String roleCode = userInfo.getRoleCode();
|
|
|
+ if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){//停用普通用户时-停用子账户
|
|
|
+ List<UserPO> subUsers = userMapper.getSubUser(userPO.getId());
|
|
|
+ if(ObjectUtil.isNotNull(subUsers)){
|
|
|
+ subUsers.forEach(po->{
|
|
|
+ PoUtil.initUpdatePo(po);
|
|
|
+ po.setVisible("0");
|
|
|
+ userMapper.saveVisible(po);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //只记录普通账户日志
|
|
|
logService.logUser(LogConstants.SYS_LOG_USER_STOP,userPO);
|
|
|
}
|
|
|
|