From 79f8b04ac8a0ae433aaca4758f3bff7e2dc8a200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 27 Jun 2024 15:55:03 +0800 Subject: [PATCH] =?UTF-8?q?jobNum=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 4 ++-- .../java/com/cool/store/service/impl/PointServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 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 cfa0a9869..2995345b3 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 @@ -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()); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index f500ffacf..719d55d2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -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; }