From 133c60c8787d9cf67ae8bd290be03ecdf01691e9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:46 +0800
Subject: [PATCH] 用户管理问题修复
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 34b14e1..80822f5 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -43,6 +43,7 @@
import org.springblade.system.user.excel.UserImporter;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
import org.springblade.system.user.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -131,7 +132,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.submit(user));
@@ -145,6 +146,15 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+
+ if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ user.setOnline_status("0");
+ }
+ if (user.getWork_status().equals("") || user.getWork_status() == null){
+ user.setWork_status("0");
+ }
+
+
return R.status(userService.updateUser(user));
}
@@ -176,7 +186,7 @@
@PostMapping("/reset-password")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "初始化密码", notes = "传入userId集合")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
boolean temp = userService.resetPassword(userIds);
return R.status(temp);
@@ -203,6 +213,10 @@
@ApiOperation(value = "修改基本信息", notes = "传入User")
public R updateInfo(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+ String avatar = user.getAvatar();
+ String substring = avatar.substring(25, avatar.length());
+ String url="https://web.byisf.com/minio"+substring;
+ user.setAvatar(url);
return R.status(userService.updateUserInfo(user));
}
@@ -291,4 +305,18 @@
return R.data(userService.platformDetail(user));
}
+ /**
+ * 查询处警人员列表
+ * @param user 用户对象
+ * @param query 分页
+ * @param response 返回
+ */
+ @GetMapping("/security-list")
+ public R<IPage<UsersVo>> page(@ApiIgnore User user, Query query, HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
+ }
+
}
--
Gitblit v1.9.3