机构，角色，用户 新增 sysType 字段

linwei

2026-02-25 774ac43c47d82d2b581c2c846a1dfc7b9ec46e64

 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java

@@ -48,10 +48,7 @@
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -96,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
@@ -339,6 +336,12 @@
         }
         // 转换数据
         Dept dept = BeanUtil.copy(deptExcel, Dept.class);
         dept.setStatus(1);
         dept.setIsDeleted(0);
         dept.setCreateTime(new Date());
         dept.setUpdateTime(new Date());
         dept.setDeptNature(2);
         dept.setDeptCategory(2);
         list.add(dept);
      });
      if (isCovered) {