From be9478ab1055637e672f38ea4d26855ea6b8d58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 11 Jul 2024 19:34:56 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApplyLicenseServiceImpl.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 42f5f1eb8..8242dc28e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -191,20 +191,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setProcessRecords(listByShopIdAndType); } ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); - SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); - if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ - EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); - if (Objects.nonNull(userInfoByJobnumber)){ - submitLicenseResponse.setApprover(userInfoByJobnumber.getName()); - } - }else { - EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); - if (Objects.nonNull(enterpriseUserDO)){ - submitLicenseResponse.setApprover(enterpriseUserDO.getName()); - } + if (shopInfoDO!=null&&shopInfoDO.getSupervisorUserId()!=null){ + EnterpriseUserDO user = enterpriseUserMapper.getUserInfoById(shopInfoDO.getSupervisorUserId()); + submitLicenseResponse.setApprover(user.getName()); } - - //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 return submitLicenseResponse; }