bug修复

This commit is contained in:
苏竹红
2024-07-11 19:34:56 +08:00
parent 9d27c807be
commit be9478ab10

View File

@@ -191,20 +191,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
submitLicenseResponse.setProcessRecords(listByShopIdAndType); submitLicenseResponse.setProcessRecords(listByShopIdAndType);
} }
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); if (shopInfoDO!=null&&shopInfoDO.getSupervisorUserId()!=null){
if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ EnterpriseUserDO user = enterpriseUserMapper.getUserInfoById(shopInfoDO.getSupervisorUserId());
EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); submitLicenseResponse.setApprover(user.getName());
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());
}
} }
//3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写 //3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写
return submitLicenseResponse; return submitLicenseResponse;
} }