活码门店

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

@@ -221,10 +221,13 @@ public class HmStoreController {
         Map<String, Integer> map = hmStoreList.stream()
                 .collect(Collectors.toMap(HmQrcodeStoreDTO::getStoreId, HmQrcodeStoreDTO::getOverFlag, (k1, k2) -> k1));
         List<String> hmStoreIdList = hmStoreList.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
-        Sets.SetView<String> setView = Sets.intersection(Sets.newHashSet(authStoreIdList),
-                Sets.newHashSet(hmStoreIdList));
-        hmStoreIdList = setView.stream().collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(hmStoreList)) {
+        logger.info("活码门店={}",hmStoreIdList);
+        if(!authStoreIdList.contains("-1")) {
+            Sets.SetView<String> setView = Sets.intersection(Sets.newHashSet(authStoreIdList),
+                    Sets.newHashSet(hmStoreIdList));
+            hmStoreIdList = setView.stream().collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(hmStoreIdList)) {
             return RestResponse.failure("-1", "无符合门店");
         }
         // 授权门店 且有活码的门店