Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmStoreController.java

@@ -105,16 +105,18 @@ public class HmStoreController {
     private void haobanStatus(List<ClerkStoreListVO> list) {
         List<String> clerkIdList = new ArrayList<>();
         if (CollectionUtils.isEmpty(list)) {
-            for (ClerkStoreListVO store : list) {
-                if (CollectionUtils.isNotEmpty(store.getClerkList())) {
-                    List<String> tempList = store.getClerkList().stream().map(dto -> dto.getClerkId())
-                            .collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(tempList)) {
-                        clerkIdList.addAll(tempList);
-                    }
+            return;
+        }
+        for (ClerkStoreListVO store : list) {
+            if (CollectionUtils.isNotEmpty(store.getClerkList())) {
+                List<String> tempList = store.getClerkList().stream().map(dto -> dto.getClerkId())
+                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(tempList)) {
+                    clerkIdList.addAll(tempList);
                 }
             }
         }
+        logger.info("导购列表={}", clerkIdList);
         // 未开启客户联系的
         List<String> status2List = new ArrayList<>();
         // 已有单人活码的
@@ -146,6 +148,9 @@ public class HmStoreController {
                             .collect(Collectors.toList()));
         }
 
+        logger.info("导购列表={}", status2List);
+        logger.info("导购列表={}", status3List);
+        logger.info("导购列表={}", status4List);
         list.stream().forEach(item -> {
             for (ClerkListVO clerk : item.getClerkList()) {
                 if (status2List.contains(clerk.getClerkId())) {