jobNum不显示
This commit is contained in:
@@ -195,12 +195,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
|
||||
if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){
|
||||
EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId());
|
||||
if (Objects.nonNull(userInfoByJobnumber)){
|
||||
submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber());
|
||||
submitLicenseResponse.setApprover(userInfoByJobnumber.getName());
|
||||
}
|
||||
}else {
|
||||
EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId());
|
||||
if (Objects.nonNull(enterpriseUserDO)){
|
||||
submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
|
||||
submitLicenseResponse.setApprover(enterpriseUserDO.getName());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -939,7 +939,7 @@ public class PointServiceImpl implements PointService {
|
||||
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId());
|
||||
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager());
|
||||
result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
|
||||
result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user