|
|
@@ -654,8 +654,11 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
res.getError().add(buildError(ErrorConstants.CUSTOM_EREXCESS, USER_RECEIVE_MAX.toString(),USER_RECEIVE_MAX.toString()));
|
|
|
return res;
|
|
|
}else if (check==-3){
|
|
|
- res.getError().add(buildError("", "私有客户已达最大限制"));
|
|
|
- return res;
|
|
|
+ //客服营销员不限制上线
|
|
|
+ if (!TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE_SALESMAN)){
|
|
|
+ res.getError().add(buildError("", "私有客户已达最大限制"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}else if (check==-4){
|
|
|
res.getError().add(buildError("", "外联客户丢失后不可再领取"));
|
|
|
return res;
|
|
|
@@ -925,7 +928,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
}
|
|
|
}
|
|
|
//领取,当前人不是客服营销员才需要判断最大现在
|
|
|
- if (operatorType ==AFTConstants.USER_TRANSFER_TO_OTHER&&(!TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE_SALESMAN))){
|
|
|
+ if (operatorType ==AFTConstants.USER_RECEIVE&&(!TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE_SALESMAN))){
|
|
|
if (customerService.checkMax(uid,aid)){
|
|
|
res.getError().add(buildError("","对方私有客户已达最大限制"));
|
|
|
return res;
|