From 24611ed866c208ec9780b99fbdeaaec2aa84865e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Jun 2023 15:03:09 +0800
Subject: [PATCH] 添加查询所有用户接口
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
index 90c8c5a..2cb6550 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
@@ -21,7 +21,9 @@
import cn.gistack.system.user.excel.UserExcel;
import cn.gistack.system.user.excel.UserImporter;
import cn.gistack.system.user.service.IUserService;
+import cn.gistack.system.user.service.impl.UserServiceImpl;
import cn.gistack.system.user.vo.UserVO;
+import cn.gistack.system.user.wrapper.UserVOWrapper;
import cn.gistack.system.user.wrapper.UserWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +51,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
@@ -98,7 +101,11 @@
return R.data(UserWrapper.build().entityVO(detail));
}
-
+ @PostMapping("/getUserByPhoneIds")
+ public R getUserByPhoneIds(String phoneIds){
+ List<User> userList = userService.getUserByPhoneIds(phoneIds);
+ return R.data(userList);
+ }
/**
* 查询单条
@@ -150,12 +157,29 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- return R.data(UserWrapper.build().pageVO(pages));
+ public R<IPage<UserVO>> page(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(UserVOWrapper.build().pageVO(pages));
}
/**
+ * 用户数据导出
+ */
+ @GetMapping("/getAllUser")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "列表", notes = "传入account和realName")
+// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<List<UserVO>> getAllUser(@ApiIgnore UserVO user, Long deptId, BladeUser bladeUser) {
+ List<UserVO> list = userService.getAllUser(user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(UserVOWrapper.build().listVO(list));
+ }
+
+
+ /**
* 新增或修改
*/
@PostMapping("/submit")
--
Gitblit v1.9.3