From 61e8c756cc2a9e503d643672f103c3837fadc1d4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 21:27:28 +0800
Subject: [PATCH] 保安员，保安公司查询修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 6111ea7..3c276f2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -180,17 +180,17 @@
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
//查询角色
- if (null!=user.getRoleId()){
- Role role = new Role();
- role.setId(Long.parseLong(user.getRoleId()));
- Role one = roleService.getOne(Condition.getQueryWrapper(role));
- if (one.getRoleAlias().equals("保安")){
- user.setHold("1");
- }
- if (one.getRoleAlias().equals("未持证保安")){
- user.setHold("2");
- }
- }
+// if (null!=user.getRoleId()){
+// Role role = new Role();
+// role.setId(Long.parseLong(user.getRoleId()));
+// Role one = roleService.getOne(Condition.getQueryWrapper(role));
+// if (one.getRoleAlias().equals("保安")){
+// user.setHold("1");
+// }
+// if (one.getRoleAlias().equals("未持证保安")){
+// user.setHold("2");
+// }
+// }
//根据 deptId 查询dept信息,公安管理员
Dept dept = iDeptService.getById(user.getDeptId());
@@ -351,7 +351,7 @@
}
/**
- * 导入用户
+ * 导入用户page-security-apply
*/
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
@@ -569,24 +569,24 @@
//获取user
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
//判断是否为空
- if (null!=user.getHold()){
+// if (null!=user.getHold()){
//持证
- if (user.getHold().equals("1")){
+// if (user.getHold().equals("1")){
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
- }
+// }
//未持证
- if (user.getHold().equals("2")){
- //分配未持证保安角色
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
- }
- }
+// if (user.getHold().equals("2")){
+// //分配未持证保安角色
+// Role role = new Role();
+// role.setRoleAlias("未持证保安");
+// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+// user.setRoleId(oneRole.getId().toString());
+// }
+// }
//密码加密
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -662,8 +662,8 @@
* @return
*/
@GetMapping("/seleL")
- public R seleL(String type,String deptid, String jurisdiction) {
- List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
+ public R seleL(String type,String deptid, String jurisdiction,Long userId) {
+ List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
return R.data(list);
}
--
Gitblit v1.9.3