Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/stock/MaterialGoodsStockLogic.java

@@ -159,7 +159,9 @@ public class MaterialGoodsStockLogic {
                 .count();
         List<WebsitNormRecord> normRecords1 = websitNormRecordService.lambdaQuery()
                 .eq(WebsitNormRecord::getGoodsType, "M")
-                .eq(WebsitNormRecord::getWorkerId, wechat.getUser().getWorkerNumber())
+                .and(v -> v.eq(WebsitNormRecord::getWorkerId, wechat.getUser().getUserId())
+                        .or()
+                        .eq(WebsitNormRecord::getWorkerNumber, wechat.getUser().getWorkerNumber()))
                 .between(WebsitNormRecord::getCreateTime, curDate + " 00:00:00", curDate + " 23:59:59")
                 .list();
         Integer partsSalesCount = websitNormRecordService.query()