fix(单位模块): 地区修改描述,提示名字重复的问题

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/AreaExhibitionServiceImpl.java

@@ -57,11 +57,12 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService {
 
     @Override
     public AreaExhibition save(AreaExhibition areaExhibition) {
-        if (!areaExhibitionCache.isNotName(areaExhibition.getAreaName())){
-            throw new ApiException(ResponseEntity.status(20020).body("区域名称重复"));
-        }
+
         if (areaExhibition.getId()==null){
             areaExhibition.setOrders(areaExhibitionCache.findAll().size()+1);
+            if (!areaExhibitionCache.isNotName(areaExhibition.getAreaName())){
+                throw new ApiException(ResponseEntity.status(20020).body("区域名称重复"));
+            }
         }else {
             AreaExhibition oldAreaExhibition = areaExhibitionCache.findById(areaExhibition.getId());
             int count=areaExhibitionCache.findAll().size();
@@ -72,6 +73,12 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService {
                         sortingAreaExhibition(areaExhibition.getOrders(),oldAreaExhibition.getOrders());
                     }
             }
+            if (!areaExhibition.getAreaName().equals(oldAreaExhibition.getAreaName())){
+                 if (!areaExhibitionCache.isNotName(areaExhibition.getAreaName())) {
+                    throw new ApiException(ResponseEntity.status(20020).body("区域名称重复"));
+                }
+            }
+
         }
         AreaExhibition areaExhibition1= areaExhibitionDao.save(areaExhibition);
         areaExhibitionCache.refresh(areaExhibitionDao.findAll());