diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java index e83ad0c47..a1e01ca61 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java @@ -124,7 +124,10 @@ public class EnterpriseUserDTO implements Serializable { List regionPaths = new ArrayList<>(); if(CollectionUtils.isNotEmpty(departmentLists)){ for (String departmentId : departmentLists) { - regionPaths.add(regionPathMap.get(departmentId)); + String regionPath = regionPathMap.get(departmentId); + if(StringUtils.isNotBlank(regionPath)){ + regionPaths.add(regionPath); + } } } //挂跟节点 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java index 447c77fcf..0766bda0f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java @@ -100,6 +100,9 @@ public class UserRegionMappingDO implements Serializable { for (EnterpriseUserDO user : userList) { List userRegionIds = JSONObject.parseArray(user.getUserRegionIds(), String.class).stream().distinct().collect(Collectors.toList()); for (String userRegionId : userRegionIds) { + if(StringUtils.isNotBlank(userRegionId)){ + continue; + } String[] split = userRegionId.split(CommonConstants.PATH_SPILT); if(split.length == 0){ continue;