社区后台基础数据库bug修改

tangxiaobao

2021-07-20 e6b848966779a12ebc2b5f4c158d7511d7132608

社区后台基础数据库bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -133,7 +133,7 @@

    @Select("<script> " +
            "SELECT " +
            "DISTINCT(cmp.`name`), " +
            "cmp.`name`, " +
            "cmp.id, " +
            "cmp.street_id, " +
            "cmp.act_id, " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -298,13 +298,19 @@
            }
        }

        List<ComMngPopulationVO> news = new ArrayList<>();
        IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
        if (!iPage.getRecords().isEmpty()) {
            List<String> collect = iPage.getRecords().stream().map(ComMngPopulationVO::getCardNo).collect(Collectors.toList());
            iPage.getRecords().forEach(populDO -> {
                if (StringUtils.isNotEmpty(populDO.getBirthday())) {
                    populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
                }
                if (!collect.contains(populDO.getCardNo())) {
                    news.add(populDO);
                }
            });
            iPage.setRecords(news);
        }
        return R.ok(iPage);
    }