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

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3533,9 +3533,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             TopOrderStatisticsBo topOrderStatisticsBo = new TopOrderStatisticsBo();
             topOrderStatisticsBo.setStartTime(startTime - time);
             topOrderStatisticsBo.setEndTime(startTime);
-            topOrderStatisticsBo.setTenantId(bo.getTenantId());
+
             topOrderStatisticsBo.setCustomerId(bo.getCustomerId());
             topOrderStatisticsBo.setBusinessName(bo.getBusinessName());
+            if(Validator.isNotEmpty(bo.getTenantId())){
+                topOrderStatisticsBo.setTenantId(bo.getTenantId());
+            }
+            if(Validator.isNotEmpty(item.getTenantId())){
+                topOrderStatisticsBo.setTenantId(item.getTenantId());
+            }
             if(Validator.isNotEmpty(item.getCreateSysUserId())){
                 topOrderStatisticsBo.setCreateSysUserId(item.getCreateSysUserId());
             }