suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner'

Browse Source
This commit is contained in:
zhangchenbiao
2023-07-06 15:18:17 +08:00
parent 07a636f860 6f99427569
commit 9ed1c096c7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java
View File

@@ -124,7 +124,10 @@ public class EnterpriseUserDTO implements Serializable {
List<String> 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);
}
}
}
//挂跟节点

3
coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
View File

@@ -100,6 +100,9 @@ public class UserRegionMappingDO implements Serializable {
for (EnterpriseUserDO user : userList) {
List<String> 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;