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 ff612bda0..a809529bf 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 @@ -612,13 +612,12 @@ public class DecorationServiceImpl implements DecorationService { if (decoration == null) { //查询测量阶段的设计组长 DecorationMeasureDO measureDO = decorationMeasureDAO.getByShopId(shopId); - if (measureDO == null) { - throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); - } DecorationDesignVO decorationDesignVO = new DecorationDesignVO(); - decorationDesignVO.setDesignLeaderId(measureDO.getDesignUserId()); - String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId().toString()); - decorationDesignVO.setDesignLeaderName(userName); + if (measureDO!=null){ + decorationDesignVO.setDesignLeaderId(measureDO.getDesignUserId()); + String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId().toString()); + decorationDesignVO.setDesignLeaderName(userName); + } return decorationDesignVO; } DecorationDesignVO decorationDesignVO = BeanUtil.toBean(decoration, DecorationDesignVO.class);