From 7e2382e701604e97f775dca55dc00cee7c5da053 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期五, 09 八月 2024 08:02:16 +0800 Subject: [PATCH] 电磁锁异常停车加入临时电子围栏提交 --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index 40598fa..8482eec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -4,6 +4,8 @@ import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.DeptUserTree; +import com.ruoyi.common.core.domain.TreeDeptWell; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelectWell; import com.ruoyi.common.core.domain.entity.SysDept; @@ -30,7 +32,7 @@ * @return 閮ㄩ棬鏍戜俊鎭泦鍚� */ public List<TreeSelect> selectDeptTreeList(SysDept dept); - + public List<TreeSelect> selectDeptTreeListNoDataScope(SysDept dept); /** * 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯 * @@ -135,11 +137,23 @@ List<SysDept> all(); + List<SysDept> allByUser(List<Long> deptList); + /** * 棰勭暀缁撴瀯鐨勬爲褰� * @param depts * @return */ - List<TreeSelectWell> wellTree(List<SysDept> depts); + List<TreeDeptWell> wellTree(List<TreeDeptWell> depts); + List<TreeDeptWell> buildDeptWellTree(List<TreeDeptWell> depts); + /** + * 浜哄憳閮ㄩ棬缁撴瀯鏍戝舰 + */ + List<DeptUserTree> deptUserTree(List<DeptUserTree> depts); + + /** + * 鏌ヨ鑷韩鍙婁笅灞炲拰鑷畾涔夋潈闄愪富閿� + * */ + List<Long> selectDeptIdBySubAndUserId(Long deptId,String usersId); } -- Gitblit v1.9.3