From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/DepartmentService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..5da9ddc 100644
--- a/src/main/java/com/mindskip/xzs/service/DepartmentService.java
+++ b/src/main/java/com/mindskip/xzs/service/DepartmentService.java
@@ -1,8 +1,7 @@
package com.mindskip.xzs.service;
-import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.domain.Department;
-import com.mindskip.xzs.domain.Question;
+import com.mindskip.xzs.domain.vo.*;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
import java.util.List;
@@ -14,7 +13,7 @@
* @param name
* @return
*/
- Integer add(String name);
+ Integer add(Department model);
/**
* 鍒犻櫎閮ㄩ棬
@@ -34,7 +33,28 @@
* 鏌ヨ鎵�鏈夐儴闂�
* @return
*/
- PageInfo<Department> gets(DepartmentResponseVM departmentResponseVM);
+ List<DepartmentResponseVM> gets(DepartmentResponseVM departmentResponseVM);
Department getById(Integer id);
+
+ DepartmentEditVO getByIdVO(Integer id);
+
+ List<Department> gets(List<Integer> deptId);
+
+ Department getName(String name);
+
+ List<BaseSelect> getDeptUserList(Integer deptId);
+
+ /**
+ * 淇敼閮ㄩ棬绠＄悊鍛�
+ * @param form
+ */
+ void updateAdmin(UpdateDeptAdminVO form);
+
+ /**
+ * 绾ц仈閫夋嫨鍣ㄦ暟鎹�
+ *
+ * @return
+ */
+ List<CascaderDataVO> cascader();
}
--
Gitblit v1.8.0