From e63338f35be0cb25e97c4f54d36533a21815304d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Oct 2024 21:05:31 +0800 Subject: [PATCH] fix --- .../main/java/com/cool/store/dao/DecorationDesignInfoDAO.java | 2 +- .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java index 8599355ca..9f0f4f182 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java @@ -32,7 +32,7 @@ public class DecorationDesignInfoDAO { return new ArrayList<>(); } Example example = new Example(DecorationDesignInfoDO.class); - example.createCriteria().andIn("shopIds", shopIds); + example.createCriteria().andIn("shopId", shopIds); return decorationDesignInfoMapper.selectByExample(example); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 275d60091..7431115d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -481,7 +481,8 @@ public class DeskServiceImpl implements DeskService { List decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds); doThing(deskStageMap, subStageList); for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) { - List deskStages = deskStageMap.get(decorationDesignInfoDO.getShopId()); + List deskStages = new ArrayList<>(); + deskStages.addAll(deskStageMap.get(decorationDesignInfoDO.getShopId())); if (CollectionUtils.isEmpty(deskStages)) { DeskStageDTO dto = new DeskStageDTO(); dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));