From bc493033ebc2ab2bea86626f3cc66727cb993b7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 03 Mar 2022 14:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2 ++
pom.xml | 1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8cc61ae..cbeaefb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,6 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
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 be87d52..e5bef50 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
@@ -550,6 +550,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
+ user.setRoleId("1372092102682521602");
+ user.setDeptId("1424615972718895106");
//查询身份证号是否有重复的,有的话只更新
User user1 = new User();
user1.setCardid(user.getCardid());
--
Gitblit v1.9.3