From 63ea601aa950e88237728bf183e30268a3af8616 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 10:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 c6283b2..5fd639c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -583,8 +583,10 @@
boolean status = userService.updateById(user);
//qfqk 数据推送
if (status) {
+ User user2 = new User();
+ user2.setId(user.getId());
//删除
- myAsyncService.deleteUserByQfqk(user);
+ myAsyncService.deleteUserByQfqk(user2);
//内网更新
String s1 =
"update blade_user set status = " + "'" + user.getStatus() + "'"
@@ -814,7 +816,8 @@
}
//修改
- boolean status = userService.updateById(user);
+// boolean status = userService.updateById(user);
+ boolean status = userService.update(user, Wrappers.<User>update().lambda().in(User::getId,user.getId()));
if (status) {
if (state == 2) {
@@ -859,15 +862,19 @@
}
//如果不重复，则进行修改操作
//更新用户账户信息
- status = userService.updateById(user);
+ status = userService.update(user, Wrappers.<User>update().lambda().in(User::getId,user.getId()));
+// status = userService.updateById(user);
if (status){
System.out.println("user = " + user);
+ User user2 = userService.getById(user.getId());
UserDTO userDTO = new UserDTO();
userDTO.setAccount(user.getAccount());
- userDTO.setPassword(user.getPassword());
- userDTO.setSecurityId(user.getId().toString());
- userDTO.setPhone(user.getPhone());
- userDTO.setAvatar(user.getAvatar());
+ userDTO.setPassword(user2.getPassword());
+ userDTO.setSecurityId(user2.getId().toString());
+ userDTO.setRealName(user1.getRealName());
+ userDTO.setPhone(user2.getPhone());
+ userDTO.setCardid(user2.getCardid());
+ userDTO.setSex(user1.getSex());
//异步修改群防群控
myAsyncService.updateUserByAccount(userDTO);
}
@@ -1080,7 +1087,7 @@
User user = userService.getById(id);
User user1 = new User();
user1.setId(user.getId());
- user1.setCardid(user.getCardid());
+// user1.setCardid(user.getCardid());
user1.setIsDeleted(1);
//qfqk 同步
myAsyncService.deleteUserByQfqk(user1);
@@ -1646,7 +1653,7 @@
"values(" + "'" + experience.getId() + "'" + "," +
"'" + experience.getName() + "'" + "," +
"'" + experience.getPost() + "'" + "," +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + experience.getCardid() + "'" +
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
@@ -1937,8 +1944,8 @@
//内网同步
String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
"," + "'" + experience.getLeaving() + "'" +
--
Gitblit v1.9.3