From 43105be63e02a447916c56d1b9707e02f7fa4d62 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 05 Jul 2022 09:10:53 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
index a7d00ff..48258a7 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
@@ -1,15 +1,21 @@
package com.gkhy.safePlatform.accountController;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountMenuService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountUserService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.query.AccountRPCQuery;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepUserRPCRespDTO;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.security.Principal;
+import java.util.List;
@RestController
@RequestMapping("/account")
@@ -19,8 +25,21 @@
private AccountUserService accountUserService;
+
@RequestMapping("/page/list")
public Object getUserPage(Principal principal, PageQuery<AccountRPCQuery> rpcQueryPageQuery) {
return accountUserService.getAccountPage(Long.valueOf(principal.getName()), rpcQueryPageQuery);
}
+
+
+ /**
+ * @Description: 获取部门下的用户列表
+ */
+ @RequestMapping(value = "/dep/list", method = RequestMethod.GET)
+ public ResultVO<List<DepUserRPCRespDTO>> depUserList(Principal principal, Long depId) {
+ String userId = principal.getName();
+ return accountUserService.getDepList(Long.valueOf(userId), depId);
+ }
+
+
}
--
Gitblit v1.9.2