From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 071ac81..e2376eb 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
@@ -136,9 +136,6 @@
}
try {
User user = identityService.newUser(id);
-
- identityService.saveUser(user);
- user.setFirstName("");
identityService.saveUser(user);
return Result.success(null);
}catch (Exception e){
@@ -165,8 +162,6 @@
try {
Group group = identityService.newGroup(id);
identityService.saveGroup(group);
- group.setName("");
- identityService.saveGroup(group);
return Result.success(null);
}catch (Exception e){
e.printStackTrace();
@@ -190,16 +185,11 @@
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);
}
@@ -286,6 +276,7 @@
@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