区经的话务/群发 门店和活动数据调整

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/CanvasDataController.java

@@ -114,10 +114,12 @@ public class CanvasDataController {
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
         setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
 
-        List<String> authStoreIdList = staffApiService
-                .getHaobanStoreIdsRolesByClerkIdAndStoreStatus(qo.getClerkId(), qo.getWxEnterpriseId(), null, null);
-        if (CollectionUtils.isNotEmpty(authStoreIdList)) {
-            jsonObject.put("storeId", authStoreIdList.stream().collect(Collectors.joining(",")));
+        if (StringUtils.isBlank(qo.getStoreId())) {
+            List<String> authStoreIdList = staffApiService
+                    .getHaobanStoreIdsRolesByClerkIdAndStoreStatus(qo.getClerkId(), qo.getWxEnterpriseId(), null, null);
+            if (CollectionUtils.isNotEmpty(authStoreIdList)) {
+                jsonObject.put("storeId", authStoreIdList.stream().collect(Collectors.joining(",")));
+            }
         }
 
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task");