From f6e87ad38aa01d70df9da3eedefa436fe88fa100 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 24 Sep 2021 19:14:52 +0800
Subject: [PATCH] 1.用户

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 2eeb085..6748e9c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -61,6 +61,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -109,8 +110,13 @@
 //			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
 //		}
 		boolean b = save(user) && submitUserDept(user);
+		String rtime = null;
+		if (null != user.getRtime()) {
+			rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+		}
+		user.setIsDeleted(0);
 		String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
-			"politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch) " +
+			"politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch,is_deleted) " +
 			"values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
 			"'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
 			"'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
@@ -126,7 +132,9 @@
 			"'" + user.getSecuritynumber() + "'" +
 			"," + "'" + user.getHold() + "'" +
 			"," + "'" + user.getStatus() + "'" +
-			"," + "'" + user.getDispatch() + "'" + ")";
+			"," + "'" + user.getDispatch() + "'"+
+			"," + "'" + user.getIsDeleted() + "'"
+			+ ")";
 		FtpUtil.sqlFileUpload(s);
 		return b;
 	}

--
Gitblit v1.9.3