feat: 周报月报导购数据

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -313,6 +313,7 @@ public class MaterialDataStaticsController {
             storeIds.add(materialReportQO.getStoreId());
         }
 
+        materialReportQO.setClerkId(null);
         Page<MaterialPersonalUsedDataVO> usedDataVOPage =
                 materialDataAdaptor.queryMaterialClerkUsedReport(materialReportQO, storeIds);
         if (usedDataVOPage == null || CollectionUtils.isEmpty(usedDataVOPage.getResult())) {
@@ -332,7 +333,7 @@ public class MaterialDataStaticsController {
         for (MaterialPersonalUsedDataVO materialPersonalUsedDataVO : usedDataVOPage.getResult()) {
             ClerkDTO clerkInfo = clerkInfoMap.get(materialPersonalUsedDataVO.getClerkId());
             if (clerkInfo != null) {
-                materialPersonalUsedDataVO.setClerkId(materialReportQO.getClerkId());
+                materialPersonalUsedDataVO.setClerkId(clerkInfo.getClerkId());
                 materialPersonalUsedDataVO.setClerkName(clerkInfo.getClerkName());
                 materialPersonalUsedDataVO.setClerkCode(clerkInfo.getClerkCode());
                 materialPersonalUsedDataVO.setImageUrl(clerkInfo.getImageUrl());