From 68deda36440e82e2d67257768166c0324ffc9077 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期日, 26 九月 2021 14:22:32 +0800 Subject: [PATCH] Merge branch 'test_bak' into 'test' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java index d176d1a..73d25e9 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java @@ -7487,6 +7487,14 @@ */ @Override public R pagePopulationListApp(PagePopulationListDTO populationListDTO) { + if(populationListDTO.getLabel() != null && "户籍人口".equals(populationListDTO.getLabel())){ + populationListDTO.setLabel(null); + populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.bd); + } + if(populationListDTO.getLabel() != null && "流动人口".equals(populationListDTO.getLabel())){ + populationListDTO.setLabel(null); + populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.wd); + } IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp( new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO); if (!pagePopulationList.getRecords().isEmpty()) { @@ -7593,10 +7601,10 @@ public R delGridPopulationAdmin(List<Long> ids) { Integer count = this.baseMapper.getPopulationVisitingCount(ids); if (count > 0) { - return R.ok("您选择的数据中存在被引用的,无法删除"); + return R.fail("您选择的数据中存在被引用的,无法删除"); } this.baseMapper.deleteBatchIds(ids); - return R.ok(); + return R.ok("删除成功"); } @Override -- Gitblit v1.7.1