所有的时候不带活码ID查询

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

@@ -170,9 +170,14 @@ public class HmQrcodeController {
         if(CollectionUtils.isEmpty(hmIds)) {
             return RestResponse.successResult(new StatisticsDTO()) ;
         }
-        StringBuffer stringBuffer = new StringBuffer();
-        hmIds.forEach(c -> stringBuffer.append(c).append(","));
-        hmQrcodeListQO.getInFields().setHmId(stringBuffer.toString());
+        // 如果是所有门店
+        if (!storeList.contains("-1") || null != qdto.getStartTime() || null != qdto.getHmGroupId() || 
+                null != qdto.getHmTypeInt() || null != qdto.getStatusFlagInt() || StringUtils.isNotBlank(qdto.getClerkSelect())
+                || StringUtils.isNotBlank(qdto.getStoreSelect()) || StringUtils.isNotBlank(qdto.getHmSelect())) {
+            StringBuffer stringBuffer = new StringBuffer();
+            hmIds.forEach(c -> stringBuffer.append(c).append(","));
+            hmQrcodeListQO.getInFields().setHmId(stringBuffer.toString());
+        }
         StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_list, hmQrcodeListQO);
         List<HmQrcodeListDTO> data = JSON.parseArray(JSON.toJSONString(statisticsDTO.getData()), HmQrcodeListDTO.class);
         if (CollectionUtils.isNotEmpty(data)) {