From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
index 6ac1707..9ad74c3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
@@ -55,26 +55,24 @@
@Override
public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
- if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
- //若行政区划不为空
- String adCode =tbResDykeVO.getAdCode();
-
- if (adCode.substring(0,4).indexOf("00") > -1) {
- //前四位包含00说明是湖北省 4200/00000000
- adCode =StringUtil.format("%{}%",adCode.substring(0,2));
- } else if (adCode.substring(0,6).indexOf("00") > -1) {
- //前六位包含00说明是市级 420100/000000
-// adCode = paramAd.substring(0,4);
- adCode =StringUtil.format("%{}%",adCode.substring(0,4));
- }else if (adCode.substring(0,8).indexOf("00") > -1){
- //前8位包含00 说明是区级 42011700/0000
-// adCode = paramAd.substring(0,6);
- adCode =StringUtil.format("%{}%",adCode.substring(0,6));
- }
- tbResDykeVO.setAdCode(adCode);
- }
-
-
+// if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
+// //若行政区划不为空
+// String adCode =tbResDykeVO.getAdCode();
+//
+// if (adCode.substring(0,4).indexOf("00") > -1) {
+// //前四位包含00说明是湖北省 4200/00000000
+// adCode =StringUtil.format("%{}%",adCode.substring(0,2));
+// } else if (adCode.substring(0,6).indexOf("00") > -1) {
+// //前六位包含00说明是市级 420100/000000
+//// adCode = paramAd.substring(0,4);
+// adCode =StringUtil.format("%{}%",adCode.substring(0,4));
+// }else if (adCode.substring(0,8).indexOf("00") > -1){
+// //前8位包含00 说明是区级 42011700/0000
+//// adCode = paramAd.substring(0,6);
+// adCode =StringUtil.format("%{}%",adCode.substring(0,6));
+// }
+// tbResDykeVO.setAdCode(adCode);
+// }
if (tbResDykeVO.getIsPage()){
return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));
--
Gitblit v1.9.3