From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index 19d8da5..5f23c20 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -6,6 +6,7 @@
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
import com.ycl.vo.user.UserVO;
@@ -72,7 +73,7 @@
/**
* 鑾峰彇鎸囧畾鐢ㄦ埛鐨勫彲璁块棶璧勬簮
*/
- List<UmsResource> getResourceList(Long adminId);
+ List<UmsMenu> getResourceList(Long adminId);
/**
* 淇敼瀵嗙爜
@@ -108,4 +109,8 @@
* @param status
*/
boolean updateStatusBatch(List<Long> ids, Integer status);
+
+
+ List<UmsAdmin> getDepartUser(Long departId);
+ String getTargetTo(String ids, String sendType);
}
--
Gitblit v1.8.0