Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 2
Родитель
Сommit
7f90c508eb

+ 5 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -329,9 +329,11 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError("","创建客户参数不全"));
 			return res;
 		}
-		if (customerService.checkMax(null,TokenManager.getAdminId())) {
-			res.getError().add(buildError("","私有客户已达最大限制"));
-			return res;
+		if (!customerService.checkAid(TokenManager.getAdminId(),Integer.valueOf(AFTConstants.CUSTOMER_SERVICE_SALESMAN))){
+			if (customerService.checkMax(null,TokenManager.getAdminId())) {
+				res.getError().add(buildError("","私有客户已达最大限制"));
+				return res;
+			}
 		}
 		if (customerService.checkOrgCode(in.getOrgCode())){
 			res.getError().add(buildError("","统一信用代码已存在"));