|
|
@@ -478,6 +478,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
roleId = "103";
|
|
|
}
|
|
|
}
|
|
|
+ //清理旧的教育身份角色
|
|
|
+ List<String> eduIdentityRoleList=new ArrayList();
|
|
|
+ eduIdentityRoleList.add("102");
|
|
|
+ eduIdentityRoleList.add("103");
|
|
|
+ QueryWrapper<SysRelation> alreadyRelationWrapper=new QueryWrapper<>();
|
|
|
+ alreadyRelationWrapper.lambda().eq(SysRelation::getObjectId, sysUser.getId());
|
|
|
+ alreadyRelationWrapper.lambda().in(SysRelation::getTargetId, eduIdentityRoleList);
|
|
|
+ alreadyRelationWrapper.lambda().eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue());
|
|
|
+ List<SysRelation> alreadyRelationList=sysRelationService.list(alreadyRelationWrapper);
|
|
|
+ List relationIdList=CollStreamUtil.toList(alreadyRelationList, SysRelation::getId);
|
|
|
+ sysRelationService.deleteByIds(relationIdList);
|
|
|
sysRelationService.saveRelationWithAppend(sysUser.getId(),roleId,SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue());
|
|
|
|
|
|
BeanUtil.copyProperties(sysUserEditParam, sysUser);
|