Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportConfigServiceImpl.java

@@ -36,17 +36,17 @@ public class ReportConfigServiceImpl extends AbstractCrudService<ReportConfigMap
         List<ReportConfigVO> list = new ArrayList<>();
         LambdaQueryWrapper<ReportConfig> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ReportConfig::getDeleteFlag, 0)
-                    .eq(ReportConfig::getTenantId, 1);
+                    .eq(ReportConfig::getTenantId, SecurityUtils.getTenantId());
         List<ReportConfig> list1 = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list1)) {
             List<ReportConfigVO> list2 = new ArrayList<>();
             List<ReportConfigVO> list3 = new ArrayList<>();
             List<ReportConfigVO> list4 = new ArrayList<>();
             List<ReportConfigVO> list5 = new ArrayList<>();
-            list2 = baseMapper.configNumList1(1);
-            list3 = baseMapper.configNumList(1,1);
-            list4 = baseMapper.configNumList(1,2);
-            list5 = baseMapper.configNumList(1,3);
+            list2 = baseMapper.configNumList1(SecurityUtils.getTenantId());
+            list3 = baseMapper.configNumList(SecurityUtils.getTenantId(),1);
+            list4 = baseMapper.configNumList(SecurityUtils.getTenantId(),2);
+            list5 = baseMapper.configNumList(SecurityUtils.getTenantId(),3);
             if (CollectionUtils.isNotEmpty(list2)) {
                 for (int i = 0; i < list2.size(); i++) {
                     for (int j = 0; j < list3.size(); j++) {