From d10a04180b9af18b94887620d2b7158b0abd1c89 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 21 Feb 2025 10:25:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=89=BE=E4=B8=8D=E5=88=B0=E4=BA=BA=20null?= =?UTF-8?q?=20=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildInformationServiceImpl.java | 8 ++++---- .../store/service/impl/DecorationServiceImpl.java | 2 +- .../service/impl/IntentAgreementServiceImpl.java | 4 ++-- .../store/service/impl/LinePayServiceImpl.java | 4 ++-- .../service/impl/OpeningOperationPlanImpl.java | 4 ++-- .../service/impl/PlatformBuildServiceImpl.java | 14 +++++++------- .../cool/store/service/impl/ShopServiceImpl.java | 8 ++++---- .../service/impl/SignFranchiseServiceImpl.java | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index f13a950dc..fa5ff27e8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -114,7 +114,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map.put("storeName",shopInfoDO.getShopName()); List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId()); List itUsers = new ArrayList<>(); - if (!itList.isEmpty()){ + if (Objects.nonNull(itList)){ itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(itUsers, @@ -122,7 +122,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId()); List posUsers = new ArrayList<>(); - if (!posList.isEmpty()){ + if (Objects.nonNull(posList)){ posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(posUsers, @@ -130,7 +130,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId()); List xfUsers = new ArrayList<>(); - if(!xfList.isEmpty()){ + if(Objects.nonNull(xfList)){ xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(xfUsers, @@ -138,7 +138,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId()); List zxtUsers = new ArrayList<>(); - if(!zxtList.isEmpty()){ + if(Objects.nonNull(zxtList)){ zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(zxtUsers, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 1f7e29f30..f76cd6c61 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -371,7 +371,7 @@ public class DecorationServiceImpl implements DecorationService { map.put("storeName", shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfoDO.getRegionId()); List userIds = new ArrayList<>(); - if (!userDOList.isEmpty()) { + if (Objects.nonNull(userDOList)) { userIds.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(userIds, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 4514b1d9d..30022e612 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -163,12 +163,12 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten SetpublishFranchiseFeeUsers = new HashSet<>(); for (Long regionId : regionIds){ List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, regionId); - if (!joinUser.isEmpty()){ + if (Objects.nonNull(joinUser)){ Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, regionId); - if (!regionUser.isEmpty()){ + if (Objects.nonNull(regionUser)){ Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index ab4e61080..eaba2246b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -157,12 +157,12 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId()); Set auditFranchiseFeeUsers = new HashSet<>(); List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId()); - if (!branchUser.isEmpty()) { + if (Objects.nonNull(branchUser)) { Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(branchUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index d8763cfc8..1a6525540 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -107,12 +107,12 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); Set planAuditUser = new HashSet<>(); List regionManagerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfoDO.getRegionId()); - if (!regionManagerUser.isEmpty()){ + if (Objects.nonNull(regionManagerUser)){ Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionManagerUserIds); } List regionalManager = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGIONAL_MANAGER, shopInfoDO.getRegionId()); - if (!regionalManager.isEmpty()){ + if (Objects.nonNull(regionalManager)){ Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionalManagerUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 92a708fa8..3b67bb090 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -113,7 +113,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); List dyCustomerUserIds = new ArrayList<>(); - if (!dyCustomerUser.isEmpty()) { + if (Objects.nonNull(dyCustomerUser)) { dyCustomerUserIds.addAll(dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(dyCustomerUserIds, @@ -137,7 +137,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); List ksUserIds = new ArrayList<>(); - if (!ksUser.isEmpty()) { + if (Objects.nonNull(ksUser)) { ksUserIds.addAll(ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(ksUserIds, @@ -161,7 +161,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); List mtbcUserIds = new ArrayList<>(); - if (!mtbcUser.isEmpty()) { + if (Objects.nonNull(mtbcUser)) { mtbcUserIds.addAll(mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtbcUserIds, @@ -185,7 +185,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); List elmUserIds = new ArrayList<>(); - if (!elmUser.isEmpty()) { + if (Objects.nonNull(elmUser)) { elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(elmUserIds, @@ -209,7 +209,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); List mtocUserIds = new ArrayList<>(); - if (!mtocUser.isEmpty()) { + if (Objects.nonNull(mtocUser)) { mtocUserIds.addAll(mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtocUserIds, @@ -421,7 +421,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); List elmUserIds = new ArrayList<>(); - if (!elmUser.isEmpty()) { + if (Objects.nonNull(elmUser)) { elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), @@ -443,7 +443,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); List mtwmUserIds = new ArrayList<>(); - if (!mtwmUser.isEmpty()) { + if (Objects.nonNull(mtwmUser)) { mtwmUserIds.addAll(mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtwmUserIds, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index f7b3a0869..8b9017a51 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -120,12 +120,12 @@ public class ShopServiceImpl implements ShopService { Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); - if (!joinUser.isEmpty()) { + if (Objects.nonNull(joinUser)) { Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } @@ -301,12 +301,12 @@ public class ShopServiceImpl implements ShopService { map.put("partnerMobile", lineInfo.getMobile()); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, request.getRegionId()); - if (!joinUser.isEmpty()) { + if (Objects.nonNull(joinUser)) { Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, request.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index e8c57010c..1a3a3c2ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -182,7 +182,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu map.put("storeName",shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId()); List finances = new ArrayList<>(); - if (!userDOList.isEmpty()){ + if (Objects.nonNull(userDOList)){ finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())) ; } commonService.sendQWMessage(finances,