From 37e8b95d39c30dd0f59d2dcc2b73fb64ee493a42 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 15:38:36 +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 3dd2e6e..a3fe945 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -270,7 +270,6 @@
 				+ ",address = " + "'" + user.getAddress() + "'"
 				+ ",registered = " + "'" + user.getRegistered() + "'"
 				+ ",rtime = " + "'" + rtime + "'"
-				+ ",paper_time = " + "'" + paperTime + "'"
 				+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
 				+ ",hold = " + "'" + user.getHold() + "'"
 				+ ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
@@ -644,7 +643,7 @@
 		}
 		//发证日期处理
 		if (user.getPaperTime() == null) {
-			paperTime = null;
+			paperTime = "";
 		} else {
 			paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
 		}
@@ -658,8 +657,11 @@
 			user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
 		}
 
-		String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
-			"politicaloutlook,healstats,height,address,registered,paper_time,rtime,securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+		String s = "insert into blade_user(" +
+			"id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+			"role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+			"politicaloutlook,healstats,height,address,registered,rtime," +
+			"securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
 			"values(" + "'" + user.getId() + "'" +
 			"," + "'" + user.getTenantId() + "'" +
 			"," + "'" + user.getAccount() + "'" +
@@ -678,12 +680,11 @@
 			"," + "'" + user.getFingerprint() + "'" +
 			"," + "'" + user.getEducation() + "'" +
 			"," + "'" + user.getPoliticaloutlook() + "'" +
-			"," + "'" + user.getHealstats() + "'"
-			+ "," + "'" + user.getHeight() + "'" +
+			"," + "'" + user.getHealstats() + "'"+
+			"," + "'" + user.getHeight() + "'" +
 			"," + "'" + user.getAddress() + "'" +
-			"," + "'" + user.getRegistered() + "'" + "," +
-			"'" + paperTime + "'" +
-			"'" + rtime + "'" +
+			"," + "'" + user.getRegistered() + "'" +
+			"," +"'" + rtime + "'" +
 			"," + "'" + user.getSecuritynumber() + "'" +
 			"," + "'" + user.getHold() + "'" +
 			"," + "'" + user.getJurisdiction() + "'" +

--
Gitblit v1.9.3