From 9a43e3aecfe477dfeae2a32ab758a2f5739614fb Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 19 九月 2023 16:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index c93eaf2..a7e0212 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -2,6 +2,9 @@
import java.util.*;
import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.TreeSelectWell;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
@@ -335,5 +338,30 @@
return getChildList(list, t).size() > 0;
}
+ @Override
+ public List<Long> deptIdBySub(Long deptId) {
+ QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("dept_id").apply("string_to_array( ancestors, ',' ) @> ARRAY [ '"+deptId+"']");
+// in("cast(ancestors as bigint)",deptId);
+ List<SysDept> list = deptMapper.selectList(queryWrapper);
+ List<Long> deptList = new ArrayList<>();
+ deptList.add(deptId);
+ for (int i = 0; i < list.size(); i++) {
+ deptList.add(list.get(i).getDeptId());
+ }
+ return deptList;
+ }
+
+ @Override
+ public List<SysDept> all() {
+ return deptMapper.selectList(null);
+ }
+
+ @Override
+ public List<TreeSelectWell> wellTree(List<SysDept> depts) {
+ List<SysDept> deptTrees = buildDeptTree(depts);
+ return deptTrees.stream().map(TreeSelectWell::new).collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3