吉安感知网项目-后端
linwei
2026-04-08 3eec84a28c462e95175935a4984fb4e47997e218
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
@@ -93,8 +93,8 @@
   @Override
   public List<DeptVO> tree(String tenantId) {
      return ForestNodeMerger.merge(baseMapper.tree(tenantId));
   public List<DeptVO> tree(String tenantId, String sysType) {
      return ForestNodeMerger.merge(baseMapper.tree(tenantId, sysType));
   }
   @Override
@@ -168,8 +168,10 @@
         dept.setAncestors(ancestors);
      }
      dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
      return saveOrUpdate(dept);
      if (dept.getId() > 0) {
         return updateById(dept);
      }
      return save(dept);
   }
   @Override
@@ -342,6 +344,7 @@
         dept.setUpdateTime(new Date());
         dept.setDeptNature(2);
         dept.setDeptCategory(2);
         dept.setSysType(String.valueOf(6));
         list.add(dept);
      });
      if (isCovered) {