From 0cd9d911b8e8634ec04cb82ea07696bb09260b03 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 十二月 2023 13:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
index 50f9d50..1d33fdc 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.dto.UmsDepartDto;
import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.UmsAdmin;
import com.ycl.vo.depart.DepartVO;
import com.ycl.vo.depart.UmsDepartVO;
@@ -41,27 +43,36 @@
/**
* 鍒犻櫎
+ *
* @param id
*/
void delete(long id);
/**
* 鏍戝舰
+ *
* @return
*/
List<UmsDepart> tree();
/**
* 鍒嗛〉
- * @param params
+ *
+ * @param page
* @return
*/
- IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params);
+ IPage<UmsDepartVO> pageDepart(String departName, IPage<UmsDepartVO> page);
+
+ List<UmsDepartDto> departExp();
/**
* 淇敼鐘舵��
+ *
* @param params
*/
void updateStatus(DepartVO.StatusDepartVO params);
+ List<UmsAdmin> selectSurplusUser();
+
+ List<UmsAdmin> selectSurplusUserAndExistUser(Long id);
}
--
Gitblit v1.8.0