BJ_FS / urbanops

Commit 808e9d0b43ba14a74bfa46471327c9b04818fb05

Authored by 戈灵虎
1 parent 1c0a1078

fix(tree): 修复树木编号重复检查逻辑

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
  View file @808e9d0
@@ -71,11 +71,6 @@ public class TreeServiceImpl implements TreeService { @@ -71,11 +71,6 @@ public class TreeServiceImpl implements TreeService {
71 // 插入 71 // 插入
72 TreeDO tree = BeanUtils.toBean(createReqVO, TreeDO.class); 72 TreeDO tree = BeanUtils.toBean(createReqVO, TreeDO.class);
73 73
74 - TreeDO treeDO = treeMapper.selectByTreeNumber(createReqVO.getTreenumber());  
75 - if (!ObjectUtils.isEmpty(treeDO)) {  
76 - throw exception(TREE_NUMBER_EXISTS);  
77 - }  
78 -  
79 if (!StringUtils.hasText(tree.getTreenumber())) { 74 if (!StringUtils.hasText(tree.getTreenumber())) {
80 Long road = tree.getRoad(); 75 Long road = tree.getRoad();
81 if (ObjectUtils.isEmpty(road)) { 76 if (ObjectUtils.isEmpty(road)) {
@@ -87,6 +82,11 @@ public class TreeServiceImpl implements TreeService { @@ -87,6 +82,11 @@ public class TreeServiceImpl implements TreeService {
87 String treeNum = prefix + String.format("%0" + 3 + "d", sequence); 82 String treeNum = prefix + String.format("%0" + 3 + "d", sequence);
88 tree.setStreet(roadDO.getStreetId()); 83 tree.setStreet(roadDO.getStreetId());
89 tree.setTreenumber(treeNum); 84 tree.setTreenumber(treeNum);
  85 + } else {
  86 + TreeDO treeDO = treeMapper.selectByTreeNumber(createReqVO.getTreenumber());
  87 + if (!ObjectUtils.isEmpty(treeDO)) {
  88 + throw exception(TREE_NUMBER_EXISTS);
  89 + }
90 } 90 }
91 91
92 treeMapper.insert(tree); 92 treeMapper.insert(tree);