|
|
@@ -2552,7 +2552,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if (uid !=null &&uid.contains(",")) {
|
|
|
isUs = true;
|
|
|
}
|
|
|
- List<String> uList = new ArrayList<>();
|
|
|
+ List<String> uList;
|
|
|
int x=0;
|
|
|
if (isUs) {
|
|
|
uList = Arrays.asList(uid.split(","));
|
|
|
@@ -2561,7 +2561,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}else {
|
|
|
x=1;
|
|
|
}
|
|
|
- int limitmax = 0;
|
|
|
+ int limitmax = 1;
|
|
|
int i = userMapper.checkUserMax(aid);
|
|
|
//加入限定项目的数量
|
|
|
int rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
|
|
|
@@ -2575,13 +2575,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
List<String > roles=adminMapper.getAdminRoleListByAid(aid);
|
|
|
for (String role : roles) {
|
|
|
if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){
|
|
|
- if(limitmax<YXZJ_MAX)limitmax = YXZJ_MAX;
|
|
|
+ if(limitmax<YXZJ_MAX)limitmax += YXZJ_MAX;
|
|
|
break;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
|
|
|
- if(limitmax<YXJL_MAX)limitmax = YXJL_MAX;
|
|
|
+ if(limitmax<YXJL_MAX)limitmax += YXJL_MAX;
|
|
|
break;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
- if(limitmax<YXY_MAX)limitmax = YXY_MAX;
|
|
|
+ if(limitmax<YXY_MAX)limitmax += YXY_MAX;
|
|
|
break;
|
|
|
}
|
|
|
}
|