diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/common/enums/RoleTypeEnum.java b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RoleTypeEnum.java
similarity index 95%
rename from tyr-server/src/main/java/cn/axzo/tyr/server/common/enums/RoleTypeEnum.java
rename to tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RoleTypeEnum.java
index ea110c50..ec0f621a 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/common/enums/RoleTypeEnum.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RoleTypeEnum.java
@@ -1,8 +1,7 @@
-package cn.axzo.tyr.server.common.enums;
+package cn.axzo.tyr.client.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 import java.util.Arrays;
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
index 78717f65..b2a927d5 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
@@ -1,47 +1,22 @@
 package cn.axzo.tyr.server.service.impl;
 
-import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.framework.domain.ServiceException;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
-import cn.axzo.tyr.client.model.req.QueryByIdentityIdTypeReq;
-import cn.axzo.tyr.client.model.req.QuerySaasPermissionGroupReq;
-import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
-import cn.axzo.tyr.client.model.req.QuerySaasRoleReq;
-import cn.axzo.tyr.client.model.res.QueryBatchByIdentityIdTypeRes;
 import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
-import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO;
-import cn.axzo.tyr.client.model.vo.SaasRoleVO;
-import cn.axzo.tyr.server.common.enums.RoleTypeEnum;
-import cn.axzo.tyr.server.common.util.StreamUtil;
-import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
+import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.server.repository.entity.SaasRole;
-import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
-import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
 import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
-import cn.axzo.tyr.server.repository.service.SaasPgroupRoleRelationDao;
 import cn.axzo.tyr.server.repository.service.SaasRoleDao;
-import cn.axzo.tyr.server.repository.service.SaasRoleGroupDao;
-import cn.axzo.tyr.server.repository.service.SaasRoleGroupRelationDao;
 import cn.axzo.tyr.server.repository.service.SaasRoleUserRelationDao;
-import cn.axzo.tyr.server.service.PermissionGroupService;
-import cn.axzo.tyr.server.service.RoleService;
 import cn.axzo.tyr.server.service.SaasRoleUserService;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**