diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java index a4bc114a..d9e090e2 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java @@ -9,7 +9,6 @@ import cn.axzo.tyr.client.model.roleuser.req.CreateWorkspaceAdminRoleParam; import cn.axzo.tyr.client.model.roleuser.req.DeleteAdminRoleParam; import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam; import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRoleParam; -import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRolesOfWorkspaceParam; import cn.axzo.tyr.client.model.roleuser.req.RoleUserParam; import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; import cn.axzo.tyr.client.model.roleuser.req.SuperAdminParam; @@ -85,13 +84,4 @@ public interface TyrSaasRoleUserApi { */ @PostMapping("/api/saas-role-user/super-admin-list") ApiResult> superAdminList(@RequestBody @Valid SuperAdminParam param); - - /** - * 删除工作台下的所有人员与平台角色 - * - * @param param - * @return - */ - @PostMapping("/api/saas-role-user/delete-user-role-of-workspace") - ApiResult deleteUserRolesOfWorkspace(@RequestBody @Valid DeleteUserRolesOfWorkspaceParam param); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java index 5de611c8..3266816e 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java @@ -11,9 +11,16 @@ import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.tyr.client.feign.TyrSaasRoleUserApi; import cn.axzo.tyr.client.model.roleuser.dto.CreateAdminRoleDTO; import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserRelationDTO; -import cn.axzo.tyr.client.model.roleuser.req.*; import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO; -import cn.axzo.tyr.client.model.roleuser.req.*; +import cn.axzo.tyr.client.model.roleuser.req.CreateAgencyAdminRoleParam; +import cn.axzo.tyr.client.model.roleuser.req.CreateWorkspaceAdminRoleParam; +import cn.axzo.tyr.client.model.roleuser.req.DeleteAdminRoleParam; +import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam; +import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRoleParam; +import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRolesOfWorkspaceParam; +import cn.axzo.tyr.client.model.roleuser.req.RoleUserParam; +import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; +import cn.axzo.tyr.client.model.roleuser.req.SuperAdminParam; import cn.axzo.tyr.server.service.SaasRoleUserRelationService; import cn.axzo.tyr.server.service.SaasRoleUserService; import lombok.RequiredArgsConstructor; @@ -57,17 +64,6 @@ public class RoleUserController implements TyrSaasRoleUserApi { return ApiResult.ok(saasRoleUserService.deleteUserRoles(param)); } - /** - * 删除工作台下的所有人员与平台角色 - * - * @param param - * @return - */ - @Override - public ApiResult deleteUserRolesOfWorkspace(DeleteUserRolesOfWorkspaceParam param) { - return ApiResult.ok(saasRoleUserService.deleteUserRolesOfWorkspace(param)); - } - @Override public ApiResult createAgencyAdminRole(CreateAgencyAdminRoleParam param) { // todo cn.axzo.basics.auth.api.SaasRoleApi#grantAgencyAdminRole diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java index 7ace7776..b14d5ad5 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java @@ -1,5 +1,11 @@ package cn.axzo.tyr.server.service; +import cn.axzo.tyr.client.model.enums.IdentityType; +import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam; +import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRoleParam; +import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; +import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; + import java.util.List; import java.util.Set; @@ -42,15 +48,6 @@ public interface SaasRoleUserService { */ boolean deleteUserRoles(DeleteUserRoleParam param); - /** - * 删除某个工作台下的人和角色 - * - * @param param - * @return - */ - boolean deleteUserRolesOfWorkspace(DeleteUserRolesOfWorkspaceParam param); - - /** *
      *  查询人所在的工作台或者单位中的数据
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 cf9ffa6a..a817997c 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
@@ -18,6 +18,9 @@ import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
 import cn.axzo.tyr.client.model.enums.IdentityType;
+import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam;
+import cn.axzo.tyr.client.model.roleuser.req.DeleteUserRoleParam;
+import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
 import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO;
 import cn.axzo.tyr.client.model.roleuser.req.*;
 import cn.axzo.tyr.server.repository.dao.SaasRoleDao;
@@ -142,23 +145,6 @@ public class RoleUserService implements SaasRoleUserService {
 		return true;
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public boolean deleteUserRolesOfWorkspace(DeleteUserRolesOfWorkspaceParam param) {
-		// 删除所有的角色
-		saasRoleDao.remove(Wrappers.lambdaQuery(SaasRole.class)
-				.eq(SaasRole::getWorkspaceId, param.getWorkspaceId())
-				.eq(SaasRole::getOwnerOuId, param.getOuId())
-				.eq(SaasRole::getRoleType, RoleTypeEnum.COMMON.getValue())
-		);
-		// 删除工作台下所有的人和角色的关系
-		roleUserRelationDao.remove(Wrappers.lambdaQuery(SaasRoleUserRelation.class)
-				.eq(SaasRoleUserRelation::getWorkspaceId, param.getWorkspaceId())
-				.eq(SaasRoleUserRelation::getOuId, param.getOuId())
-		);
-		return true;
-	}
-
 	@Override
 	public List queryByWorkspaceIdOrOu(Long identityId, IdentityType identityType, Set workspaceIds, Set ouIds) {
 		return roleUserRelationDao.queryByWorkspaceIdOrOu(identityId, identityType, workspaceIds, ouIds);