From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/service/DepartmentService.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/DepartmentService.java b/src/main/java/com/mindskip/xzs/service/DepartmentService.java
index 4a3cb86..13a8ea4 100644
--- a/src/main/java/com/mindskip/xzs/service/DepartmentService.java
+++ b/src/main/java/com/mindskip/xzs/service/DepartmentService.java
@@ -2,7 +2,8 @@
 
 import com.github.pagehelper.PageInfo;
 import com.mindskip.xzs.domain.Department;
-import com.mindskip.xzs.domain.Question;
+import com.mindskip.xzs.domain.vo.BaseSelect;
+import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
 import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
 
 import java.util.List;
@@ -34,7 +35,19 @@
      * 鏌ヨ鎵�鏈夐儴闂�
      * @return
      */
-    PageInfo<Department> gets(DepartmentResponseVM departmentResponseVM);
+    PageInfo<DepartmentResponseVM> gets(DepartmentResponseVM departmentResponseVM);
 
     Department getById(Integer id);
+
+    List<Department> gets(List<Integer> deptId);
+
+    Department getName(String name);
+
+    List<BaseSelect> getDeptUserList(Integer deptId);
+
+    /**
+     * 淇敼閮ㄩ棬绠$悊鍛�
+     * @param form
+     */
+    void updateAdmin(UpdateDeptAdminVO form);
 }

--
Gitblit v1.8.0