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; }