|
|
@@ -110,12 +110,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Autowired
|
|
|
private AdminUserCountMapper adminUserCountMapper;
|
|
|
@Autowired
|
|
|
- private RestrictProjectMapper restProjectMapper;
|
|
|
+ private RestrictProjectMapper restrictProjectMapper;
|
|
|
@Autowired
|
|
|
private AsyncUtils asyncUtils;
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@Value(value = "${upload.path}")
|
|
|
private String uploadPath = null;
|
|
|
|
|
|
@@ -869,7 +870,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
// 更新业务中间表
|
|
|
addUserFollowBusiness(userFollowBusiness, ubId, ub, ufbId, followId);
|
|
|
}
|
|
|
- restProjectMapper.updateRefreshLockTime(fbb.getUid(),ub.getBusinessProjectId(),TokenManager.getAdminId());
|
|
|
+ restrictProjectMapper.updateRefreshLockTime(fbb.getUid(),ub.getBusinessProjectId(),TokenManager.getAdminId());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1607,7 +1608,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if (u.getShareType()!=1)return -1;
|
|
|
if (u.getNewChannel()==1)return 0;
|
|
|
}
|
|
|
- if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return -2;
|
|
|
+ int privateCount = userMapper.UserReceiveCount(TokenManager.getAdminId());
|
|
|
+ if (privateCount >= USER_RECEIVE_MAX)return -2;
|
|
|
if(checkMax(uid,TokenManager.getAdminId()))return -3;
|
|
|
if(checkBeforeChannel(uid)) return -4;
|
|
|
return 0;
|
|
|
@@ -2561,25 +2563,26 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
int limitmax = 0;
|
|
|
int i = userMapper.checkUserMax(aid);
|
|
|
+ int rpCount =restrictProjectMapper.selectPrivteByAid(TokenManager.getAdminId());
|
|
|
+ i=i+rpCount;
|
|
|
if (uid !=null){
|
|
|
User user =userMapper.selectByPrimaryKey(uid);
|
|
|
if (user.getNewChannel()==1){
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
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)){
|
|
|
+ break;
|
|
|
+ } else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
|
|
|
if(limitmax<YXJL_MAX)limitmax = YXJL_MAX;
|
|
|
- continue;
|
|
|
- } else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
+ break;
|
|
|
+ } else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
if(limitmax<YXY_MAX)limitmax = YXY_MAX;
|
|
|
- continue;
|
|
|
- }
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
i+=x;
|
|
|
if (i >= limitmax) {
|