From 29d7fafb766ed9eec51da333cda5eb5de979647a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 09 Mar 2022 11:37:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index c2108e3..75dccea 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -546,13 +546,12 @@
if (userCount > 0) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- user.setRoleId("1372092102682521602");
+ user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
user.setStype("1");
user.setId(null);
//用户新增
boolean status = userService.save(user);
-// System.out.println("user = " + user);
//返回
return R.status(status);
}
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 4cd8d2d..b420155 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
@@ -558,8 +558,9 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- user.setRoleId("1372092102682521602");
+ user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
+ user.setStype("1");
//查询身份证号是否有重复的,有的话只更新
User user1 = new User();
user1.setCardid(user.getCardid());
--
Gitblit v1.9.3