cim-查询数据

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java

@@ -148,21 +148,21 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
         queryWrapper.eq(DashboardOverviewEnt::getIsDelete, "0");
         queryWrapper.eq(DashboardOverviewEnt::getYear, getDateTime().getYear());
         queryWrapper.eq(DashboardOverviewEnt::getMonth, getDateTime().getMonth());
-        queryWrapper.eq(DashboardOverviewEnt::getDistrictCode,bo.getCode());
+        queryWrapper.eq(bo.getCode()!=null && bo.getCode().isBlank(),DashboardOverviewEnt::getCityCode,bo.getCode());
         List<DashboardOverviewEnt> list = dashboardOverviewEntMapper.selectList(queryWrapper);
 
         LambdaQueryWrapper<DashboardOverviewUnit> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(DashboardOverviewUnit::getIsDelete, "0");
         queryWrapper2.eq(DashboardOverviewUnit::getYear, getDateTime().getYear());
         queryWrapper2.eq(DashboardOverviewUnit::getMonth, getDateTime().getMonth());
-        queryWrapper2.eq(DashboardOverviewUnit::getDistrictCode,bo.getCode());
+        queryWrapper2.eq(bo.getCode()!=null && bo.getCode().isBlank(),DashboardOverviewUnit::getCityCode,bo.getCode());
         List<DashboardOverviewUnit> list2 = dashboardOverviewUnitMapper.selectList(queryWrapper2);
 
         LambdaQueryWrapper<DashboardOverviewPersonnel> queryWrapper3 = new LambdaQueryWrapper<>();
         queryWrapper3.eq(DashboardOverviewPersonnel::getIsDelete, "0");
         queryWrapper3.eq(DashboardOverviewPersonnel::getYear, getDateTime().getYear());
         queryWrapper3.eq(DashboardOverviewPersonnel::getMonth, getDateTime().getMonth());
-        queryWrapper3.eq(DashboardOverviewPersonnel::getDistrictCode,bo.getCode());
+        queryWrapper3.eq(bo.getCode()!=null && bo.getCode().isBlank(),DashboardOverviewPersonnel::getCityCode,bo.getCode());
         List<DashboardOverviewPersonnel> list3 = dashboardOverviewPersonnelMapper.selectList(queryWrapper3);
 
         Map<String, Object> map = new HashMap<>();