From 9103d10ddff7276a7e497122676d86bdcadf9d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 14 May 2025 14:37:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=80=81=E5=BA=97=E6=96=B0=E5=BC=80=E8=A3=85=E4=BF=AE=E4=B8=8E?= =?UTF-8?q?=E5=BC=80=E4=B8=9A=E7=9B=B4=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/DecorationServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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);