From 8b3c09e2404002126a625ba07d89b0c6fb797712 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Thu, 17 Oct 2024 14:15:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
index dd675de..6f941ff 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -6,6 +6,7 @@
import cn.huge.module.grid.service.GridUserService;
import cn.huge.module.sys.dto.GridRoleMenuDTO;
import cn.huge.module.sys.dto.GridUserRoleDTO;
+import cn.huge.module.sys.vo.GridOrgUsersVo;
import cn.huge.module.sys.vo.GridRoleMenuVo;
import cn.huge.module.sys.vo.GridUserRoleVo;
import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,11 @@
return gridUserService.getUserInfo(gridTokenVo);
}
+ @PostMapping("/get-org-users")
+ public R<List<GridUserVo>> getUserListByOrg(@RequestBody GridOrgUsersVo gridOrgUsersVo) {
+ return gridUserService.getUserListByOrg(gridOrgUsersVo);
+ }
+
@PostMapping("/get-user-role")
public R<List<GridUserRoleDTO>> getUserRoleList(@RequestBody GridUserRoleVo gridUserRoleVo) {
return gridUserService.getUserRoleList(gridUserRoleVo);
--
Gitblit v1.8.0