From b5636e416a2fe029f96aec6ddfd3489394925b15 Mon Sep 17 00:00:00 2001 From: kimi <kimi42345@gmail.com> Date: 星期二, 24 三月 2020 19:33:53 +0800 Subject: [PATCH] add 数据权限 --- src/main/java/com/highdatas/mdm/service/act/impl/IdentityServiceImpl.java | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 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 aa878e3..bc7c58c 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 @@ -1,6 +1,7 @@ package com.highdatas.mdm.service.act.impl; import com.highdatas.mdm.entity.TUser; +import com.highdatas.mdm.mapper.TableInfoMapper; import com.highdatas.mdm.pojo.CodeMsg; import com.highdatas.mdm.pojo.Result; import org.activiti.engine.IdentityService; @@ -17,6 +18,7 @@ import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class IdentityServiceImpl extends BaseServiceImpl implements com.highdatas.mdm.service.act.IdentityService{ @@ -26,7 +28,8 @@ RuntimeService runtimeService; @Autowired RepositoryService repositoryService; - + @Autowired + TableInfoMapper tableInfoMapper; @Override public String startProcess(String businessId, String key) { @@ -88,6 +91,10 @@ @Override public Result addUser(String id) { + User preUser = identityService.createUserQuery().userId(id).singleResult(); + if (preUser != null) { + return Result.error(new CodeMsg(6002, "宸叉湁鐩稿悓id鐨勭敤鎴峰瓨鍦�")); + } try { User user = identityService.newUser(id); identityService.saveUser(user); @@ -101,6 +108,10 @@ @Override public Result addRole(String id) { + Group preGroup = identityService.createGroupQuery().groupId(id).singleResult(); + if (preGroup != null) { + return Result.error(new CodeMsg(6002, "宸叉湁鐩稿悓id鐨勮鑹插瓨鍦�")); + } try { Group group = identityService.newGroup(id); identityService.saveGroup(group); @@ -118,11 +129,12 @@ if (user == null) { return Result.error(new CodeMsg(3001, "褰撳墠鐢ㄦ埛涓嶅瓨鍦�,璇峰厛鍒涘缓鐢ㄦ埛")); } - Group group = identityService.createGroupQuery().groupId(roleId).singleResult(); - if (user == null) { - return Result.error(new CodeMsg(3001, "褰撳墠瑙掕壊涓嶅瓨鍦�,璇峰厛瑙掕壊鐢ㄦ埛")); - } - identityService.createMembership(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); } catch (Exception e) { @@ -174,6 +186,11 @@ if (user == null) { return Result.error(new CodeMsg(3001, "褰撳墠瑙掕壊涓嶅瓨鍦�,璇峰厛瑙掕壊鐢ㄦ埛")); } + + Map<String, String> memberShip = tableInfoMapper.selectActMemberShip(userId, roleId); + if (memberShip == null) { + return Result.success(null); + } identityService.deleteMembership(userId,roleId); return Result.success(null); } -- Gitblit v1.8.0