|
@@ -301,15 +301,17 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
|
|
|
HashMap<String, List<User>> byNumList = this.getByNumList(numList, param.getSceneType());
|
|
|
Boolean flag = true;
|
|
|
for (String num : numList) {
|
|
|
- if(byNumList.get(num).size() + param.getUserNameList().size() >5){
|
|
|
- throw new BusinessException(ResultCode.COO_LIMIT_ERROR);
|
|
|
- }
|
|
|
- List<User> users = byNumList.get(num);
|
|
|
- List<String> collect = users.stream().map(User::getUserName).collect(Collectors.toList());
|
|
|
Boolean inFlag = true;
|
|
|
- for (String userName : param.getUserNameList()) {
|
|
|
- if(!collect.contains(userName)){
|
|
|
- inFlag = false;
|
|
|
+ if(byNumList.get(num) != null && !byNumList.isEmpty()){
|
|
|
+ if(byNumList.get(num).size() + param.getUserNameList().size() >5){
|
|
|
+ throw new BusinessException(ResultCode.COO_LIMIT_ERROR);
|
|
|
+ }
|
|
|
+ List<User> users = byNumList.get(num);
|
|
|
+ List<String> collect = users.stream().map(User::getUserName).collect(Collectors.toList());
|
|
|
+ for (String userName : param.getUserNameList()) {
|
|
|
+ if(!collect.contains(userName)){
|
|
|
+ inFlag = false;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
flag = !inFlag;
|