Merge branch 'feature/xgh/202506迭代' into 'developer'

朋友圈数据

See merge request !3015

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -141,6 +141,7 @@ public class HmLinkServiceImpl implements HmLinkService {
             this.delCache(oldLink.getLinkId(), oldLink.getShortCode());
             oldWelcomeId = oldLink.getWelcomeId();
             TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto);
+
             this.linkMapper.update(entity);
         }
         // 单人活码

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentDataController.java

@@ -374,9 +374,12 @@ public class QwMomentDataController {
 
 
     public Map<String, StoreDTO> storeMap(Set<String> storeIdList) {
+        Map<String, StoreDTO> storeMap = new HashMap<>();
+        if(CollectionUtils.isEmpty(storeIdList)) {
+            return storeMap ;
+        }
         List<String> list = new ArrayList<>() ;
         list.addAll(storeIdList) ;
-        Map<String, StoreDTO> storeMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(storeIdList)) {
             List<StoreDTO> mainStoreList = storeService.queryStore(list);
             if (CollectionUtils.isNotEmpty(mainStoreList)) {
@@ -388,6 +391,9 @@ public class QwMomentDataController {
 
     public Map<String, ClerkDTO> clerkMap(Set<String> clerkIdList) {
         Map<String, ClerkDTO> clerkMap = new HashMap<>();
+        if(CollectionUtils.isEmpty(clerkIdList)) {
+            return clerkMap ;
+        }
         List<ClerkDTO> mainClerkList = clerkService.getClerkByClerkIds(clerkIdList);
         if (CollectionUtils.isNotEmpty(mainClerkList)) {
             clerkMap = mainClerkList.stream().collect(Collectors.toMap(e -> e.getClerkId(), e -> e));