From bd87fa03a852a61d4d7477a2ac32d09e74ad6e72 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 28 Jun 2022 19:50:18 +0800
Subject: [PATCH] 保安账户密码修改同步调整
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 65a6914..f9c2c0c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -607,22 +607,22 @@
boolean status = false;
if (null!=one){
//修改
- if (null!= one.getAccount()) {
+ if (null!= user.getAccount()) {
one.setAccount(user.getAccount());
}
- if (null!= one.getCardid()) {
+ if (null!= user.getCardid()) {
one.setCardid(user.getCardid());
}
- if (null!= one.getPassword()) {
+ if (null!= user.getPassword()) {
one.setPassword(user.getPassword());
}
- if (null!= one.getAvatar()) {
+ if (null!= user.getAvatar()) {
one.setAvatar(user.getAvatar());
}
- if (null!= one.getPhone()) {
+ if (null!= user.getPhone()) {
one.setPhone(user.getPhone());
}
- if (null!= one.getRealName()) {
+ if (null!= user.getRealName()) {
one.setRealName(user.getRealName());
}
one.setUpdateTime(new Date());
@@ -639,18 +639,19 @@
@PostMapping("/removeSecurity")
@Transactional(rollbackFor = Exception.class)
public R removeSecurity(@RequestBody User user) {
+ System.out.println("保安员开始删除 = " + user);
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setSecurityId(user.getSecurityId());
+ user1.setSecurityId(user.getId().toString());
// user1.setCardid(user.getCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
- //修改
- one.setIsDeleted(1);
+ System.out.println("查询到保安员 = " + one);
//用户修改
status = userService.removeById(one.getId());
+ System.out.println("保安员删除状态： = " + status);
}
//返回
return R.status(status);
--
Gitblit v1.9.3