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/revoke/mapper/RevokeMapper.xml | 2 +-
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 3 +--
src/main/java/org/springblade/modules/system/controller/UserController.java | 20 ++++++++++++++++++--
src/main/java/org/springblade/modules/system/entity/User.java | 4 +++-
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 2 +-
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index a96ab6c..395787f 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -41,8 +41,7 @@
<select id="selectIn" resultType="java.util.HashMap">
select *
from sys_permit
- where storage = 0
- and cardid = #{cardid} and ptype=#{type }
+ where and cardid = #{cardid} and ptype=#{type }
</select>
<insert id="insertPer" useGeneratedKeys="true" keyProperty="id">
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 8073e0a..0ee7960 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -41,7 +41,7 @@
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_record where storage=0 and cardid=#{cardid} and ptype=#{type}
+ select * from sys_record where cardid=#{cardid} and ptype=#{type}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
index 11c7b42..b93f60a 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -39,6 +39,6 @@
select * from sys_revoke
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_revoke where storage=0 and cardid=#{cardid} and ptype=#{type}
+ select * from sys_revoke where cardid=#{cardid} and ptype=#{type}
</select>
</mapper>
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()+"'"
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 865dbdb..bfe1a81 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -153,7 +153,9 @@
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
- private String rtime;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date rtime;
private String hold;
--
Gitblit v1.9.3