From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 6167971..161b350 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -180,20 +180,7 @@
user.setCardid(zc.getCardid());
iUserService.saveOrUpdate(user);
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid," +
- "jurisdiction,examination_type,status,is_deleted) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExamination_type() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" + ")";
- System.out.println(s);
- FtpUtil.sqlFileUpload(s);
}
return R.status(zcService.saveOrUpdate(zc));
}
@@ -220,6 +207,23 @@
String times = df.format(new Date());
zc.setZctime(times);
zcService.inster(zc);
+
+ String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid)" +
+ "values(" + zc.getId() + "'" +
+ "," + "'" + zc.getUsername() + "'" +
+ "," + "'" + zc.getPassword() + "'" +
+ "," + "'" + zc.getSname() + "'" +
+ "," + "'" + zc.getSex() + "'" +
+ "," + "'" + zc.getPhone() + "'" +
+ "," + "'" + zc.getZctime() + "'" +
+ "," + "'" + zc.getDeptid() + "'" +
+ "," + "'" + zc.getParentId() + "'" +
+ "," + "'" + zc.getJurisdiction() + "'" +
+ "," + "'" + zc.getCardid() + "'" + ")";
+
+ System.out.println(s);
+ FtpUtil.sqlFileUpload(s);
+
return R.success("新增成功");
}
--
Gitblit v1.9.3