anderx лет назад: 3
Родитель
Сommit
9a00e50e6e

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

@@ -2109,18 +2109,24 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userFollowMapper.updateByPrimaryKeySelective(uf);
 	}
 
+
+
+
 	@Override
 	public boolean checkMax(String uid,String aid) {
 		boolean isUs = false;
-		if (uid.contains(",")) {
+		if (uid !=null &&uid.contains(",")) {
 			isUs = true;
 		}
 		List<String> uList = new ArrayList<>();
+		int x=0;
 		if (isUs) {
 			uList = Arrays.asList(uid.split(","));
 			uid=uList.get(0);
+			x=uList.size();
+		}else {
+			x=1;
 		}
-		int x=uList.size();
 		int y = 0;
 		int i = userMapper.checkUserMax(aid);
 		if (uid !=null){
@@ -2128,6 +2134,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if (user.getNewChannel()==1){
 				return false;
 			}
+		}else {
+
 		}
 		List<String > roles=adminMapper.getAdminRoleListByAid(aid);
 		for (String role : roles) {