From cb5035579ae02a3aca05904ab419816f2fc509f2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 bdd0df7..7c8faa3 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
@@ -1,10 +1,9 @@
package com.ruoyi.system.service.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
@@ -21,6 +20,8 @@
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
+import javax.annotation.Resource;
+
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇
*
@@ -29,10 +30,10 @@
@Service
public class SysDeptServiceImpl implements ISysDeptService
{
- @Autowired
+ @Resource
private SysDeptMapper deptMapper;
- @Autowired
+ @Resource
private SysRoleMapper roleMapper;
/**
@@ -335,4 +336,20 @@
{
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;
+ }
+
+
}
--
Gitblit v1.9.3