From 6e2861b3f043093acba050594ca91b0044aa7b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Tue, 17 Mar 2026 08:54:48 +0000 Subject: [PATCH] Merge #65 into master from cc_20260317_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat：建店信息 副总裁 * cc_20260317_fix: (3 commits squashed) - feat：建店信息 - feat：建店信息 - feat：建店信息 副总裁 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/65 --- .../impl/BuildInformationServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index cf4342303..f5ef67124 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -86,6 +86,8 @@ public class BuildInformationServiceImpl implements BuildInformationService { private ShopAuditInfoDAO shopAuditInfoDAO; @Resource private OperationLogDAO operationLogDAO; + @Autowired + private RegionDao regionDao; @Override @@ -269,16 +271,18 @@ public class BuildInformationServiceImpl implements BuildInformationService { } } if (StringUtils.isBlank(response.getXgjVicePresident())) { - List userList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId()); - if (CollectionUtils.isNotEmpty(userList)) { - List xgjVicePresidentList = enumInfoService.getByTypeCode(ZxjpEnum.XGJ_VICE_PRESIDENT.getCode()); - List userNameSet = userList.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()); - List xgjVicePresidentNameList = xgjVicePresidentList.stream().map(EnumInfoDO::getSysValue).collect(Collectors.toList()); - List resultUserNameList = userNameSet.stream() - .filter(xgjVicePresidentNameList::contains) - .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(resultUserNameList)){ - response.setXgjVicePresident(resultUserNameList.get(0)); + RegionDO region = regionDao.getRegionById(shopInfo.getRegionId()); + if (!Objects.isNull(region)){ + String parentId = region.getParentId(); + RegionDO parentRegion = regionDao.getRegionById(Long.valueOf(parentId)); + if (!Objects.isNull(parentRegion)){ + String name = parentRegion.getName(); + if (name != null && name.contains("_")) { + String president = name.substring(name.indexOf("_") + 1); + response.setXgjVicePresident(president); + } else { + response.setXgjVicePresident(name); + } } } }