Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-05-07 84e8a5e53cd8b56193211c8b99d1a43be2b46434

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java

@@ -134,6 +134,9 @@
        // 接收村编号（主键）
        Long villageId = po.getVillageId();

        PrDivide prDivide = DtoToDividePojo.INSTANCT.po2vo(po);

        if (villageId!=null){
        /**
         * 获取5级行政区划信息
         */
@@ -141,13 +144,11 @@
        if(map_districts.size() <= 0) {
            return BaseResponseUtils.buildFail("区划信息有误");
        }

        PrDivide prDivide = DtoToDividePojo.INSTANCT.po2vo(po);

        Long countryId = Long.parseLong(map_districts.get("countryId").toString());
        Long townId = Long.parseLong(map_districts.get("townId").toString());
        prDivide.setCountyid(countryId);
        prDivide.setTownid(townId);
        }

        Date operateTime = new Date();
        prDivide.setOperatedt(operateTime);
@@ -220,6 +221,7 @@
        // 接收村编号（主键）
        Long villageId = po.getVillageid();

        if (villageId!=null){
        /**
         * 获取5级行政区划信息
         */
@@ -227,12 +229,11 @@
        if(map_districts.size() <= 0) {
            return BaseResponseUtils.buildFail("区划信息有误");
        }

        Long countryId = Long.parseLong(map_districts.get("countryId").toString());
        Long townId = Long.parseLong(map_districts.get("townId").toString());

        po.setCountyid(countryId);
        po.setTownid(townId);
        }

        Date operateTime = new Date();
        po.setOperatedt(operateTime);