From fb1238cf8982d299cb24536938bbeee942c2226e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 08:53:30 +0800
Subject: [PATCH] 成绩修改审核修改成绩合格后修改用户制证状态为未制证
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 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 c53ae9b..082b299 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
@@ -715,13 +715,13 @@
treeNode.setParentId(Long.parseLong(user.getDeptId()));
tree.get(0).getChildren().add(treeNode);
}
+ //获取子节点
+ List<TreeNode> children = tree.get(0).getChildren();
+ //排序
+ List<TreeNode> nodes = children.stream().sorted(Comparator.comparing(TreeNode::getId)).collect(Collectors.toList());
+ //设置排序后的集合
+ tree.get(0).setChildren(nodes);
}
- //获取子节点
- List<TreeNode> children = tree.get(0).getChildren();
- //排序
- List<TreeNode> nodes = children.stream().sorted(Comparator.comparing(TreeNode::getId)).collect(Collectors.toList());
- //设置排序后的集合
- tree.get(0).setChildren(nodes);
//返回
return tree;
}
@@ -854,26 +854,60 @@
//新增
this.save(user);
//内网同步
+// String s = "insert into blade_user(" +
+// "id,tenant_id,account,password,real_name,phone,sex,role_id,dept_id," +
+// "cardid,nation,registered,securitynumber,hold,status,is_deleted) " +
+// "values(" + "'" + user.getId() + "'" + "," +
+// "'" + user.getTenantId() + "'" + "," +
+// "'" + user.getAccount() + "'" + "," +
+// "'" + user.getPassword() + "'" + "," +
+// "'" + user.getRealName() + "'" + "," +
+// "'" + user.getPhone() + "'" + "," +
+// "'" + user.getSex() + "'" + "," +
+// "'" + user.getRoleId() + "'" +
+// "," + "'" + user.getDeptId() + "'" +
+// "," + "'" + user.getCardid() + "'" +
+// "," + "'" + user.getNation() + "'" +
+// "," + "'" + user.getRegistered() + "'" +
+// "," + "'" + user.getSecuritynumber() + "'" +
+// "," + "'" + user.getHold() + "'" +
+// "," + "'" + user.getStatus() + "'" +
+// "," + "'" + user.getIsDeleted() + "'"
+// + ")";
String s = "insert into blade_user(" +
- "id,tenant_id,account,password,real_name,phone,sex,role_id,dept_id," +
- "cardid,nation,registered,securitynumber,hold,status,is_deleted) " +
- "values(" + "'" + user.getId() + "'" + "," +
- "'" + user.getTenantId() + "'" + "," +
- "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +
- "'" + user.getRealName() + "'" + "," +
- "'" + user.getPhone() + "'" + "," +
- "'" + user.getSex() + "'" + "," +
- "'" + user.getRoleId() + "'" +
+ "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," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+ "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.getNativeplace() + "'" +
"," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'"+
+ "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
"," + "'" + user.getRegistered() + "'" +
"," + "'" + user.getSecuritynumber() + "'" +
"," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'"
- + ")";
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
FtpUtil.sqlFileUpload(s);
}else {
//匹配组织机构是否一致,如果不一致
--
Gitblit v1.9.3