From 61edd5588e27a9335f0003649d7d69526badeee7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 09 九月 2021 10:17:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 59521c0..38bccc9 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 @@ -1,8 +1,8 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.page.IServicePlus; import java.util.List; @@ -11,7 +11,7 @@ * * @author ruoyi */ -public interface ISysDeptService extends IServicePlus<SysDept> { +public interface ISysDeptService extends IService<SysDept> { /** * 鏌ヨ閮ㄩ棬绠$悊鏁版嵁 * @@ -58,7 +58,7 @@ * @param deptId 閮ㄩ棬ID * @return 瀛愰儴闂ㄦ暟 */ - public int selectNormalChildrenDeptById(Long deptId); + public long selectNormalChildrenDeptById(Long deptId); /** * 鏄惁瀛樺湪閮ㄩ棬瀛愯妭鐐� @@ -85,6 +85,13 @@ public String checkDeptNameUnique(SysDept dept); /** + * 鏍¢獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄� + * + * @param deptId 閮ㄩ棬id + */ + public void checkDeptDataScope(Long deptId); + + /** * 鏂板淇濆瓨閮ㄩ棬淇℃伅 * * @param dept 閮ㄩ棬淇℃伅 -- Gitblit v1.9.3