From 1357573c2574aeb629f66b20ad87676351405f0b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 十月 2024 13:05:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
index 64fa4b2..2a49134 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
@@ -83,7 +83,9 @@
return R.error("the phone already exist");
}
- user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+ if (Cools.isEmpty(user.getPassword())) {
+ user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+ }
user.setCreateBy(getLoginUserId());
user.setCreateTime(new Date());
@@ -95,13 +97,15 @@
}
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
- for (Long roleId : user.getRoleIds()) {
- if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
- throw new CoolException("Internal Server Error");
+ if (!Cools.isEmpty((Object) user.getRoleIds())) {
+ for (Long roleId : user.getRoleIds()) {
+ if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
+ throw new CoolException("Internal Server Error");
+ }
}
}
- return R.ok("Save Success");
+ return R.ok("Save Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:update')")
@@ -109,6 +113,9 @@
@PostMapping("/user/update")
@Transactional
public R update(@RequestBody User user) {
+ if (user.getPassword() != null && user.getPassword().equals("")) {
+ user.setPassword(null);
+ }
if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>()
.eq(User::getUsername, user.getUsername())
.ne(User::getId, user.getId())) > 0) {
@@ -145,7 +152,7 @@
}
}
- return R.ok("Update Success");
+ return R.ok("Update Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:remove')")
@@ -157,11 +164,9 @@
if (!userService.removeById(userId)) {
throw new CoolException("Internal Server Error");
}
- if (!userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId))) {
- throw new CoolException("Internal Server Error");
- }
+ userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId));
}
- return R.ok("Delete Success");
+ return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('system:user:list')")
--
Gitblit v1.9.1