merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 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);