From c6901af945ffbabafb4d50f39d2beb3b6a4af677 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 09 七月 2025 17:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/mapper/SysDeptMapper.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/SysDeptMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SysDeptMapper.java
index 8b72534..50fd0f7 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/SysDeptMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SysDeptMapper.java
@@ -2,6 +2,9 @@
import com.gkhy.exam.common.domain.entity.SysDept;
+import com.gkhy.exam.system.domain.SysDeptManage;
+import com.gkhy.exam.system.domain.req.SysDeptPageReq;
+import com.gkhy.exam.system.domain.vo.DeptVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,7 +22,13 @@
* @param dept 部门信息
* @return 部门信息集合
*/
- public List<SysDept> selectDeptList(SysDept dept);
+ public List<DeptVo> selectDeptList(SysDept dept);
+
+
+ public List<DeptVo> selectDeptPageList(SysDeptPageReq dept);
+
+
+ int selectDeptListCount(SysDept dept);
/**
*
@@ -54,6 +63,14 @@
public List<SysDept> selectChildrenDeptById(Long deptId);
/**
+ * 过滤掉本身和子级部门
+ * @param deptId
+ * @return
+ */
+
+ List<SysDept> getParentInfo(Long deptId);
+
+ /**
* 根据ID查询所有子部门（正常状态）
*
* @param deptId 部门ID
@@ -84,7 +101,7 @@
* @param parentId 父部门ID
* @return 结果
*/
- public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+ public SysDept checkDeptNameUnique(@Param("companyId") Long companyId,@Param("deptName") String deptName, @Param("parentId") Long parentId);
/**
* 新增部门信息
@@ -124,4 +141,10 @@
* @return 结果
*/
public int deleteDeptById(Long deptId);
+
+
+ int insetMangeBatch(List<SysDeptManage> sysDeptManages);
+ int deleteMangeBatch(long deptId);
+
+ List<SysDeptManage> getAllManage(long deptId);
}
--
Gitblit v1.9.2