Bläddra i källkod

领取客户判定修改

anderx 1 år sedan
förälder
incheckning
b51d00990f

+ 1 - 1
src/main/java/com/goafanti/business/controller/RestrictProjectController.java

@@ -33,7 +33,7 @@ public class RestrictProjectController extends CertifyApiController {
                     ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
             return res;
         }
-        if (restrictProjectService.checkMax()){
+        if (restrictProjectService.checkMax(in.getUid())){
             return res.error(buildError("领取失败!您的“私有客户/私有限定项目”总计已超出最大限制,请移出相关数据后,再来领取!"));
         }
         return res.data(restrictProjectService.add(in));

+ 1 - 1
src/main/java/com/goafanti/business/service/RestrictProjectService.java

@@ -16,5 +16,5 @@ public interface RestrictProjectService {
 
     Object getRestrictProjectUser(String ids);
 
-    boolean checkMax();
+    boolean checkMax(String uid);
 }

+ 13 - 2
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -273,12 +273,23 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
     }
 
     @Override
-    public boolean checkMax() {
+    public boolean checkMax(String uid) {
         int i = userMapper.checkUserMax(TokenManager.getAdminId());
-        int limitMax=100;
+        int limitMax=101;
         //加入限定项目的数量
         int rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
         i=i+rpCount;
+        User user = userMapper.selectByPrimaryKey(uid);
+        if (user.getShareType()==0||user.getShareType()==2){
+            //0私有 2签单
+            if (!user.getAid().equals(TokenManager.getAdminId())){
+                //是自己的
+                i++;
+            }
+       }else if(user.getShareType()==1) {
+            //公共客户
+            i++;
+       }
         if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR)){
             if(limitMax<YXZJ_MAX)limitMax = YXZJ_MAX;
         } else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){

+ 5 - 5
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -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;
             }
 		}