From 82fbbf24939e150ee3cef90dc0dd843c9897a7e6 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 23 五月 2020 12:27:13 +0800
Subject: [PATCH] 添加 log前 去除bak文件前的备份
---
src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java b/src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java
index 6640113..dba205a 100644
--- a/src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java
@@ -113,6 +113,9 @@
}
try {
User user = identityService.newUser(id);
+
+ identityService.saveUser(user);
+ user.setFirstName("");
identityService.saveUser(user);
return Result.success(null);
}catch (Exception e){
@@ -132,6 +135,8 @@
try {
Group group = identityService.newGroup(id);
identityService.saveGroup(group);
+ group.setName("");
+ identityService.saveGroup(group);
return Result.success(null);
}catch (Exception e){
e.printStackTrace();
@@ -147,11 +152,16 @@
if (user == null) {
return Result.error(new CodeMsg(3001, "褰撳墠鐢ㄦ埛涓嶅瓨鍦�,璇峰厛鍒涘缓鐢ㄦ埛"));
}
+ Group group = identityService.createGroupQuery().groupId(roleId).singleResult();
+ if (group == null) {
+ return Result.error(new CodeMsg(3001, "褰撳墠瑙掕壊涓嶅瓨鍦�,璇峰厛鍒涘缓鐢ㄦ埛"));
+ }
- Map<String, String> memberShip = tableInfoMapper.selectActMemberShip(userId, roleId);
+ Map<String, String> memberShip = tableInfoMapper.selectActMemberShip(userId, roleId);
if (memberShip != null) {
return Result.success(null);
}
+
identityService.createMembership(userId,roleId);
return Result.success(null);
}
@@ -219,7 +229,6 @@
@Transactional(rollbackFor = {RuntimeException.class, Error.class})
public Result deleteUserRole(String roleId, String userId) {
try {
-
Map<String, String> memberShip = tableInfoMapper.selectActMemberShip(userId, roleId);
if (memberShip == null) {
return Result.success(null);
--
Gitblit v1.8.0