From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 1b0ae7d..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
@@ -1,12 +1,14 @@
package cn.huge.module.grid.controller;
import cn.huge.base.common.bo.R;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
-import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
import cn.huge.module.grid.domain.vo.*;
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;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,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);
@@ -48,4 +55,9 @@
public R<List<GridRoleMenuDTO>> getRoleMenu(@RequestBody GridRoleMenuVo gridRoleMenuVo) {
return gridUserService.getRoleMenu(gridRoleMenuVo);
}
+
+ public R<String> initNewUsers(@RequestBody GridUserRoleVo gridUserRoleVo){
+ return gridUserService.initNewUsers(gridUserRoleVo);
+
+ }
}
--
Gitblit v1.8.0