画布待完成会员列表

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

@@ -10,6 +10,7 @@ import com.gic.haoban.manage.web.utils.EsMemberInfoUtils;
 import com.gic.haoban.manage.web.vo.canvas.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -148,6 +149,11 @@ public class CanvasDataController {
         setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
         jsonObject.put("subType", "all");
 
+        if (StringUtils.isNotBlank(qo.getClerkId()) && staffApiService.isManager(qo.getClerkId())) {
+            //店长不需要传参
+            jsonObject.remove("clerkId");
+        }
+
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task");
         Page<CanvasStoreTaskVO> page = DataApiUtils.getPageData(res, CanvasStoreTaskVO.class);
         return RestResponse.successResult(page);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/canvas/CanvasStoreTaskQO.java

@@ -37,6 +37,11 @@ public class CanvasStoreTaskQO extends PageQo implements Serializable {
     private String canvasQuery;
 
     /**
+     * 活动ID
+     */
+    private String canvasId;
+
+    /**
      * 门店ID
      */
     private String storeId;