From c0f21a9745daa3afef19110025bdee9d0ba00338 Mon Sep 17 00:00:00 2001
From: ludc <2870569285@qq.com>
Date: 星期日, 26 三月 2023 01:29:15 +0800
Subject: [PATCH] 更新部分后端代码
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index 1fc64b3..c6c8bde 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -64,6 +65,9 @@
private final IRoleMenuService roleMenuService;
private final IDictBizService dictBizService;
private final IUserClient userClient;
+ private final IStrategyService strategyService;
+ private final IUserPwdstrategyService userPwdstrategyService;
+
/**
* 鑾峰彇鏄惁鍏佽鑷鎺у埗涓夊憳鏄惁寮�鍚�
*/
@@ -120,12 +124,13 @@
LinkedList<DictBiz> dictBizs = new LinkedList<>();
List<DictBiz> dictBizList = getDictBizs(tenantId, dictBizs);
dictBizService.saveBatch(dictBizList);
- // 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁ょ鐞嗙敤鎴�
- User userInfo = generateUser(tenantId, role, dept, postInfo);
+ // 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁ょ鐞嗙敤
+ User user = generateUser(tenantId, role, dept, postInfo);
// 鍏堜繚瀛樼鎴�
boolean temp = super.saveOrUpdate(tenant);
// 鍒涘缓鐢ㄦ埛
- R<Boolean> result = userClient.saveUser(userInfo);
+ R<Boolean> result = userClient.saveUser(user);
+ //鐢熸垚鐢ㄦ埛瀵嗙爜绛栫暐绠＄悊璁板綍
if (!result.isSuccess()) {
throw new ServiceException(result.getMsg());
}
@@ -227,6 +232,7 @@
user.setName(role.getRoleAlias());
user.setRealName(role.getRoleName());
user.setAccount(role.getRoleAlias());
+ user.setStrategyUpdateStatus(CommonConstant.TOP_PARENT_ID);
// 鑾峰彇鍙傛暟閰嶇疆鐨勫瘑鐮�
String password = Func.toStr(ParamCache.getValue(PASSWORD_KEY), DEFAULT_PASSWORD);
user.setPassword(password);
--
Gitblit v1.9.3