From c199d41a417faa6e0370d75f3437cd78cffff0b5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 09 Aug 2021 20:42:52 +0800
Subject: [PATCH] 1.派遣记录查询接口修改 2.取消报名接口新增 3.保安列表（未持证）查询接口新增
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 021b09b..9ca8728 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -124,8 +124,8 @@
@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));
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
}
/**
@@ -137,8 +137,6 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
- arg arg = new arg();
- arg.test01(arg.url+"/blade-user/save",user);
return R.status(userService.submit(user));
}
@@ -238,21 +236,21 @@
return R.success("操作成功");
}
- /**
- * 导出用户
- */
- @GetMapping("export-user")
- @ApiOperationSupport(order = 13)
- @ApiOperation(value = "导出用户", notes = "传入user")
- public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
- if (!AuthUtil.isAdministrator()) {
- queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
- }
- queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<UserExcel> list = userService.exportUser(queryWrapper);
- ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
- }
+// /**
+// * 导出用户
+// */
+// @GetMapping("export-user")
+// @ApiOperationSupport(order = 13)
+// @ApiOperation(value = "导出用户", notes = "传入user")
+// public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+// if (!AuthUtil.isAdministrator()) {
+// queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
+// }
+// queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<UserExcel> list = userService.exportUser(queryWrapper);
+// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
+// }
/**
* 导出模板
@@ -321,8 +319,40 @@
@GetMapping("/page-security")
public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
user.setAccount("admin");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ bladeUser.setTenantId("000000");
+ IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, "000000");
return R.data(UserWrapper.build().pageVO(pages));
}
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-unit")
+ public List<User> pageSecurityUnit(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ user.setAccount("admin");
+ bladeUser.setTenantId("000000");
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ return pages;
+ }
+
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-units")
+ public R pageSecurityUnits(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ bladeUser.setTenantId("000000");
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
+ }
+
+ /**
+ * 保安员列表，帅选无保安证
+ */
+ @GetMapping("/page-security-apply")
+ public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
+ bladeUser.setTenantId("000000");
+ IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
+ }
+
}
--
Gitblit v1.9.3