系统包过滤管理员

gonglilong

2024-09-13 0cf306a80a8f189a2a664cf447cc0fbef5684bf8

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java

@@ -38,6 +38,7 @@
import cn.gistack.system.wrapper.DeptWrapper;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -93,15 +94,27 @@
      if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
         return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
      }
      return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
      String [] parentIds = parentId.split(",");
      List<String> parentIdList = new ArrayList<>();
      for (String str:parentIds) {
         parentIdList.add(str);
      }
      return ForestNodeMerger.merge(baseMapper.treeByParentId(parentIdList));
   }

   @Override
   public List<DeptVO> lazyTree(String tenantId, Long parentId) {
   public List<DeptVO> lazyTree(String tenantId, String parentIds) {
      if (AuthUtil.isAdministrator()) {
         tenantId = StringPool.EMPTY;
      }
      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));

      String [] parentIdStr = parentIds.split(",");
      List<Long> parentIdList = new ArrayList<>();
      for (String str:parentIdStr) {
         parentIdList.add(Long.parseLong(str));
      }

      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentIdList));
   }

   @Override
@@ -221,6 +234,7 @@
      //找到移到哪个行政区划下的机构
      QueryWrapper<Dept> query2 = new QueryWrapper<>();
      query2.eq("AD_CODE",adCode);
      query2.likeRight("ID","42");// 临时处理，后续考虑优化
      Dept adCodeDept = getOne(query2);

      if (resDept != null && adCodeDept != null){
@@ -234,4 +248,17 @@
   public String getResDept(String deptIds) {
      return baseMapper.getResDept(deptIds);
   }

   @Override
   public List<DeptVO> treeByParentIdNew(String parentId,String precinct) {
//      if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
//         return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
//      }
      String [] parentIds = parentId.split(",");
      List<String> parentIdList = new ArrayList<>();
      for (String str:parentIds) {
         parentIdList.add(str);
      }
      return ForestNodeMerger.merge(baseMapper.treeByParentIdNew(parentIdList,precinct));
   }
}