Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -93,6 +93,16 @@
        return R.ok(vos);
    }

    @Override
    public R getVillageById(Long villageId) {
        ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
        comMngVillageDO = comActVillageDAO.selectById(villageId);
        if (comMngVillageDO != null) {
            return R.ok(comMngVillageDO);
        }
        return R.fail();
    }


    @Override
    public R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO) {
@@ -269,9 +279,13 @@
            villageBuildingList.forEach(villageBuilding -> {
                if(!villageBuilding.getFloor().contains("栋")){
                    villageBuilding.setFloorString(villageBuilding.getFloor() + "栋");
                }else{
                    villageBuilding.setFloorString(villageBuilding.getFloor());
                }
                if(!villageBuilding.getUnitNo().contains("单元")){
                    villageBuilding.setUnitNoString(villageBuilding.getUnitNo() + "单元");
                }else{
                    villageBuilding.setUnitNoString(villageBuilding.getUnitNo());
                }
            });
        }