1112修改提交

101captain

2021-11-12 e959172a457f60c2e16b69f60e3404df5fdffcfe

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

@@ -4996,6 +4996,7 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());
        populationDO.setDeath(vo.getDeath().toString());

        String cardNoAES = populationDO.getCardNo();
        try {
@@ -6572,17 +6573,19 @@
    public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
        IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
            new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);

        iPage.getRecords().forEach(page -> {
            if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
                StringBuilder sb = new StringBuilder();
                sb.append(page.getAlley());
                if(!page.getHouseNum().contains("号")){
                    sb.append(page.getHouseNum() + "号");
        if(iPage!=null){
            iPage.getRecords().forEach(page -> {
                if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
                    StringBuilder sb = new StringBuilder();
                    sb.append(page.getAlley());
                    if(!page.getHouseNum().contains("号")){
                        sb.append(page.getHouseNum() + "号");
                    }
                    page.setAreaName(sb.toString());
                }
                page.setAreaName(sb.toString());
            }
        });
            });
        }

        return R.ok(iPage);
    }