fix(单位模块): 修改了更新单位性质的时候会把单位类型也改掉

dev-user/src/main/java/com/tykj/dev/device/user/cache/UnitsCache.java

@@ -98,4 +98,12 @@ public class UnitsCache {
         return unitsList.stream().sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
     }
 
+
+    /**
+     * 根据单位名称查询是否存在
+     */
+    public boolean isNotName(String name){
+       return new ArrayList<>(idMap.values()).stream().allMatch(units -> !units.getName().equals(name));
+    }
+
 }

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

@@ -541,6 +541,8 @@ public class UnitsServiceImpl implements UnitsService {
         Units unitsOld=unitsCache.findById(units.getUnitId());
         if (!units.getLevel().equals(unitsOld.getLevel())){
             units.setType(levelToType(units.getLevel()));
+        }else {
+            units.setType(unitsOld.getType());
         }
         //原来上级单位对象
         Units parentUnitOld= findByParentUnit(unitsOld);
@@ -639,6 +641,9 @@ public class UnitsServiceImpl implements UnitsService {
 
     @Override
     public Units save(Units units) {
+//        if (!unitsCache.isNotName(units.getName())){
+//
+//        }
         if (units.getAreaId() != null && units.getAreaId() != 0) {
             Optional<Area> optionalArea = areaDao.findById(units.getAreaId());
             if (optionalArea.isPresent()) {