From 260a7c7aeb0133db69fb741b320151f0f7dd1b00 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 27 Sep 2022 11:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BD=91=E6=A0=BC=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cm/systemcity/service/grid/impl/GridServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cm/systemcity/service/grid/impl/GridServiceImpl.java b/src/main/java/com/cm/systemcity/service/grid/impl/GridServiceImpl.java
index 5f1f146..0873089 100644
--- a/src/main/java/com/cm/systemcity/service/grid/impl/GridServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/grid/impl/GridServiceImpl.java
@@ -577,7 +577,11 @@ public class GridServiceImpl extends BaseService implements IGridService {
      */
     private String getSaveGridCode(String areaCode) {
         GridPO areaLastPO = getAreaLastPO(areaCode);
-        return areaLastPO == null ? String.format("%s001", areaCode.substring(0, 12)) : String.valueOf(Long.valueOf(areaLastPO.getGridCode()) + 1);
+        if (areaLastPO == null) {
+            return String.format("%s001", areaCode);
+        }
+        String gridCode = areaLastPO.getGridCode().substring(areaLastPO.getGridCode().length() - 3);
+        return areaCode + String.format("%03d", (Integer.parseInt(gridCode) + 1));
     }
 
     /**
@@ -594,7 +598,7 @@ public class GridServiceImpl extends BaseService implements IGridService {
         }
         // 网格为空，递增
         if (StringUtils.isBlank(gridCode)) {
-            return areaCode + String.format("%03d", Integer.parseInt(areaLastPO.getGridCode().substring(areaLastPO.getGridCode().length() - 4)) + 1);
+            return areaCode + String.format("%03d", Integer.parseInt(areaLastPO.getGridCode().substring(areaLastPO.getGridCode().length() - 3)) + 1);
         }
         // 网格编码存在不更改
         return areaCode + String.format("%03d", Integer.parseInt(gridCode.substring(gridCode.length() - 3)));