|
|
@@ -1377,6 +1377,31 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Integer queryUserMax() {
|
|
|
+ String aid=TokenManager.getAdminId();
|
|
|
+ int limitmax = 0;
|
|
|
+ int mymax = userMapper.checkUserMax(aid);
|
|
|
+ List<String > roles=adminMapper.getAdminRoleListByAid(aid);
|
|
|
+ for (String role : roles) {
|
|
|
+ if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){
|
|
|
+ if(limitmax<YXZJ_MAX)limitmax = YXZJ_MAX;
|
|
|
+ continue;
|
|
|
+ } else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
|
|
|
+ if(limitmax<YXJL_MAX)limitmax = YXJL_MAX;
|
|
|
+ continue;
|
|
|
+ } else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
+ if(limitmax<YXY_MAX)limitmax = YXY_MAX;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (mymax==limitmax){
|
|
|
+ return 1;
|
|
|
+ }else {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 处理中间表
|
|
|
@@ -2253,7 +2278,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}else {
|
|
|
x=1;
|
|
|
}
|
|
|
- int y = 0;
|
|
|
+ int limitmax = 0;
|
|
|
int i = userMapper.checkUserMax(aid);
|
|
|
if (uid !=null){
|
|
|
User user =userMapper.selectByPrimaryKey(uid);
|
|
|
@@ -2265,18 +2290,18 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
List<String > roles=adminMapper.getAdminRoleListByAid(aid);
|
|
|
for (String role : roles) {
|
|
|
if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){
|
|
|
- y = YXZJ_MAX;
|
|
|
- break;
|
|
|
+ if(limitmax<YXZJ_MAX)limitmax = YXZJ_MAX;
|
|
|
+ continue;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
|
|
|
- y = YXJL_MAX;
|
|
|
- break;
|
|
|
+ if(limitmax<YXJL_MAX)limitmax = YXJL_MAX;
|
|
|
+ continue;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
- y = YXY_MAX;
|
|
|
- break;
|
|
|
+ if(limitmax<YXY_MAX)limitmax = YXY_MAX;
|
|
|
+ continue;
|
|
|
}
|
|
|
}
|
|
|
i+=x;
|
|
|
- if (i >= y) {
|
|
|
+ if (i >= limitmax) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|