From 375a59e29d765c07b95f42a491a6dc926da33988 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Fri, 9 Oct 2026 11:36:38 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CimDashboardOverviewDataSumSserviceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 509947cd..3375fc15 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/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 list = dashboardOverviewEntMapper.selectList(queryWrapper); LambdaQueryWrapper 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 list2 = dashboardOverviewUnitMapper.selectList(queryWrapper2); LambdaQueryWrapper 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 list3 = dashboardOverviewPersonnelMapper.selectList(queryWrapper3); Map map = new HashMap<>();