From 2063a93b5f7d4837e0dfd7c2c3c936af8419700f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 20:28:56 +0800
Subject: [PATCH] 1.备案
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 5f70e52..6b12fba 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -72,6 +72,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -226,8 +227,23 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
userService.updateUser(user);
- String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
- String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ Date birthday1 = user.getBirthday();
+ String birthday;
+ String rtime;
+ if (user.getBirthday()==null){
+ birthday =null;
+ }
+ else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ }
+
+ if ( user.getRtime()==null){
+ rtime =null;
+ }
+ else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ }
+
String s1 =
"update blade_user set account = " + "'" + user.getAccount()+ "'"
+ ",password = " + "'" + user.getPassword()+"'"
--
Gitblit v1.9.3