Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java

@@ -187,7 +187,7 @@
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);
      } else {
         Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId());
         Integer gridStatistics = baseMapper.getGridStatistics(code, null);
         Integer companyStatistics = baseMapper.getCompanyStatistics(code, null);
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);