From 935fda56e95270493d9e3e46d28b29125d330ca3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 29 七月 2024 16:31:02 +0800
Subject: [PATCH] 修改：流媒体转码使用ffmpeg绝对路径，配置文件中增加ffmpegPath 增加：部门列表查询和部门详情查询无数据权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 63a92e1..efd07f5 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
@@ -62,6 +62,12 @@
return buildDeptTreeSelect(depts);
}
+ @Override
+ public List<TreeSelect> selectDeptTreeListNoDataScope(SysDept dept) {
+ List<SysDept> depts = deptMapper.selectDeptListNoDataScope(dept);
+ return buildDeptTreeSelect(depts);
+ }
+
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
*
@@ -359,7 +365,7 @@
@Override
public List<SysDept> allByUser(List<Long> deptList) {
QueryWrapper<SysDept> queryWrapper = new QueryWrapper();
- queryWrapper.in("dept_id",deptList);
+ queryWrapper.in("dept_id",deptList).eq("del_flag","0");
return deptMapper.selectList(queryWrapper);
}
@@ -450,6 +456,21 @@
return returnList;
}
+ @Override
+ public List<Long> selectDeptIdBySubAndUserId(Long deptId, String usersId) {
+ List<Long> deptIdList = new ArrayList();
+ //鏈骇鍙婁笅灞為儴闂�
+ List<Long> ownAndSubDeptIdList = deptMapper.selectDeptIdBySub(deptId);
+ //鑷畾涔�
+ List<Long> roleDeptIdList = deptMapper.selectRoleDeptIdByUsersId(usersId);
+ //鍘婚噸
+ Set<Long> deptIdSet = new HashSet();
+ deptIdSet.addAll(ownAndSubDeptIdList);
+ deptIdSet.addAll(roleDeptIdList);
+ deptIdList.addAll(deptIdSet);
+ return deptIdList;
+ }
+
private void recursionFnDeptUserTree(List<DeptUserTree> list, DeptUserTree t)
{
// 寰楀埌瀛愯妭鐐瑰垪琛�
--
Gitblit v1.9.3