From 03331c596d4b6202387486d8b5b06ff4b2b5d0e2 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 09 Mar 2022 10:45:39 +0800
Subject: [PATCH] 保安员新增角色id 修改

---
 src/main/java/org/springblade/modules/zc/controller/ZcController.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index a6b84d6..e1e4de0 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -216,21 +216,26 @@
 		user.setRealName(zc.getSname());
 		user.setSex(Integer.valueOf(zc.getSex()));
 		user.setPhone(zc.getPhone());
-		user.setDeptId(zc.getDeptid());
+		//user.setDeptId(zc.getDeptid());
 		user.setRoleId(zc.getParentId());
 		user.setWorkaddress(zc.getWorkaddress());
 		user.setWorkjurisdiction(zc.getWorkjurisdiction());
-		user.setJurisdiction(zc.getJurisdiction());
 		user.setExamination_type("0");
 		user.setExamination_mx("正常");
 		user.setCardid(zc.getCardid());
-		if (zc.getSignal() != null) {
-			user.setSignal(zc.getSignal());
+		if (!zc.getSignals().equals("")) {
+			user.setSignals(zc.getSignals());
 		}
 		user.setStype("0");
-		user.setAddress(zc.getAddress());
+		if (!zc.getAddress().equals("")) {
+			user.setAddress(zc.getAddress());
+			user.setJurisdiction(zc.getJurisdiction());
+		}
+		if (!zc.getJobUnit().equals("")) {
+			user.setJobUnit(zc.getJobUnit());
+		}
 		iUserService.saveOrUpdate(user);
-		String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid,address)" +
+		String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,parent_id,jurisdiction,cardid,address)" +
 			"values(" + "'" + zc.getId() + "'" +
 			"," + "'" + zc.getUsername() + "'" +
 			"," + "'" + zc.getPassword() + "'" +
@@ -238,12 +243,25 @@
 			"," + "'" + zc.getSex() + "'" +
 			"," + "'" + zc.getPhone() + "'" +
 			"," + "'" + zc.getZctime() + "'" +
-			"," + "'" + zc.getDeptid() + "'" +
 			"," + "'" + zc.getParentId() + "'" +
 			"," + "'" + zc.getJurisdiction() + "'" +
 			"," + "'" + zc.getCardid() + "'" +
 			"," + "'" + zc.getAddress() + "'"
 			+ ")";
+//		String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid,address)" +
+//			"values(" + "'" + zc.getId() + "'" +
+//			"," + "'" + zc.getUsername() + "'" +
+//			"," + "'" + zc.getPassword() + "'" +
+//			"," + "'" + zc.getSname() + "'" +
+//			"," + "'" + zc.getSex() + "'" +
+//			"," + "'" + zc.getPhone() + "'" +
+//			"," + "'" + zc.getZctime() + "'" +
+//			"," + "'" + zc.getDeptid() + "'" +
+//			"," + "'" + zc.getParentId() + "'" +
+//			"," + "'" + zc.getJurisdiction() + "'" +
+//			"," + "'" + zc.getCardid() + "'" +
+//			"," + "'" + zc.getAddress() + "'"
+//			+ ")";
 		FtpUtil.sqlFileUpload(s);
 		return R.success("新增成功");
 	}

--
Gitblit v1.9.3