diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index d7c83021b..95ba10339 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -165,7 +165,7 @@ public class FirstOrderServiceImp implements FirstOrderService { } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); - order.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); + order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); return order; } } 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 6279a6e37..6fd67d2c9 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 @@ -116,14 +116,20 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); List allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId()); - List collect = allUserByRoleEnumAndRegionId.stream() - .filter(user -> user.getName() != null) - .map(user -> user.getName() + "_" + user.getJobnumber()) - .collect(Collectors.toList()); + List collect = new ArrayList<>(); + if (CollectionUtils.isEmpty(allUserByRoleEnumAndRegionId)){ + collect = null; + }else { + collect = allUserByRoleEnumAndRegionId.stream() + .filter(user -> user.getName() != null) + .map(user -> user.getName() + "_" + user.getJobnumber()) + .collect(Collectors.toList()); + } + if (Objects.nonNull(openingOperationPlanDO)) { openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); - openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); - openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); + openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); @@ -133,8 +139,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { openingOperationPlanVO.setShopName(shopInfo.getShopName()); return openingOperationPlanVO; } - openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); - openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); + openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); return openingOperationPlanVO; } 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 a2696744e..3a9accd1a 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(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); return result; }