Browse Source

修改判定

anderx 1 year ago
parent
commit
5baf5eaca1

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -77,6 +77,8 @@ public class AFTConstants {
 	public static final String  FINANCE								= "97";
 	/**	营销员 */
 	public static final String  SALESMAN                      		= "96";
+	/**	总裁助理 */
+	public static final String	SALESMAN_ASSISTANT						= "86";
 	/**
 	 * 技术转移
 	 */

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

@@ -1634,16 +1634,18 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		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;
-			}
+            switch (role) {
+                case AFTConstants.SALESMAN_DIRECTOR:
+                    if (limitmax < YXZJ_MAX) limitmax = YXZJ_MAX;
+                    break;
+                case AFTConstants.SALESMAN_MANAGER:
+                    if (limitmax < YXJL_MAX) limitmax = YXJL_MAX;
+                    break;
+                case AFTConstants.SALESMAN:
+                case AFTConstants.SALESMAN_ASSISTANT:
+                    if (limitmax < YXY_MAX) limitmax = YXY_MAX;
+                    break;
+            }
 		}
 		if (mymax==limitmax){
 			return 1;

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1714,6 +1714,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					for (OutPublicReleaseDetails ord : outPublicReleaseDetails) {
 						User user = userMapper.selectByPrimaryKey(ord.getUid());
 						if (user.getAid().equals(aid)){
+							flag=false;
 							myExamine=true;
 						}
 					}