From 808e9d0b43ba14a74bfa46471327c9b04818fb05 Mon Sep 17 00:00:00 2001
From: 戈灵虎 <50576256@qq.com>
Date: Mon, 5 Jan 2026 09:08:33 +0800
Subject: [PATCH] fix(tree): 修复树木编号重复检查逻辑

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
index 78abc34..5a526d5 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
@@ -71,11 +71,6 @@ public class TreeServiceImpl implements TreeService {
         // 插入
         TreeDO tree = BeanUtils.toBean(createReqVO, TreeDO.class);
 
-        TreeDO treeDO = treeMapper.selectByTreeNumber(createReqVO.getTreenumber());
-        if (!ObjectUtils.isEmpty(treeDO)) {
-            throw exception(TREE_NUMBER_EXISTS);
-        }
-
         if (!StringUtils.hasText(tree.getTreenumber())) {
             Long road = tree.getRoad();
             if (ObjectUtils.isEmpty(road)) {
@@ -87,6 +82,11 @@ public class TreeServiceImpl implements TreeService {
             String treeNum = prefix + String.format("%0" + 3 + "d", sequence);
             tree.setStreet(roadDO.getStreetId());
             tree.setTreenumber(treeNum);
+        } else {
+            TreeDO treeDO = treeMapper.selectByTreeNumber(createReqVO.getTreenumber());
+            if (!ObjectUtils.isEmpty(treeDO)) {
+                throw exception(TREE_NUMBER_EXISTS);
+            }
         }
 
         treeMapper.insert(tree);
--
libgit2 0.21.4