From 8910275656c9bf398832dc14957a03684a593e96 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 30 八月 2024 15:16:58 +0800 Subject: [PATCH] 2024-08-30 朱宝民 修改配置文件bug --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java index ff2cfeb..48e7256 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java @@ -2,12 +2,14 @@ import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper; import com.dy.pipIrrGlobal.pojoBa.BaDistrict; +import com.dy.pipIrrGlobal.util.DistrictLevel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -29,6 +31,8 @@ List<BaDistrict> list = this.dao.selectByLevel(firstLevel) ; if(list != null && list.size() > 0){ for(BaDistrict po : list){ + po.canDelete = false ; + po.canAdd = true ; getSubDistrict(po) ; } } @@ -51,7 +55,7 @@ */ @Transactional public int save(BaDistrict po){ - return this.dao.insert(po) ; + return this.dao.putin(po) ; } /** @@ -71,7 +75,7 @@ */ @Transactional public int delete(Long id){ - return this.dao.deleteLogicById(id) ; + return this.dao.deleteByPrimaryKey(id) ; } /** @@ -85,7 +89,32 @@ for(BaDistrict subPo : po.subDistricts){ getSubDistrict(subPo) ; } + }else{ + //娌℃湁涓嬬骇浜嗭紝鍙互鍒犻櫎 + po.canDelete = false ; + if(po.level.code.byteValue() == DistrictLevel.Village.code.byteValue()){ + //鍒版潙绾т簡锛屼笉鍙互鍐嶆坊鍔犺鏀垮尯浜� + po.canAdd = false ; + } } } } + + /** + * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃 + * @param level + * @return + */ + public List<Map<String, Object>> getDistrictgsByLevel(Integer level) { + return dao.getDistrictgsByLevel(level); + } + + /** + * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃 + * @param supperId + * @return + */ + public List<Map<String, Object>> getDistrictsBySupperId(Long supperId) { + return dao.getDistrictsBySupperId(supperId); + } } -- Gitblit v1.8.0