From 55a64d39b9797809f7fc4cd4329bf0187f70207f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Wed, 18 Dec 2024 14:35:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-3282)=20=E5=8E=BB=E6=8E=89=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=BA=9F=E5=BC=83=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/repository/dao/SaasRoleDao.java    | 21 -------------------
 .../repository/dao/SaasRoleGroupDao.java      |  7 -------
 .../dao/SaasRoleUserRelationDao.java          | 16 --------------
 3 files changed, 44 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java
index 6e0a67f2..c878af86 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java
@@ -60,27 +60,6 @@ public class SaasRoleDao extends ServiceImpl<SaasRoleMapper, SaasRole> {
 		return this.getBaseMapper().listRoleUserByPermissionGroup(permissionGroupIdList, workspaceIds);
 	}
 
-	public SaasRole findRoleByTypeAndWorkspaceIdAndOuId(String roleType, Long workspaceId,
-														Long ouId) {
-		return this.lambdaQuery()
-				.eq(SaasRole::getRoleType, roleType)
-				.eq(SaasRole::getWorkspaceId, workspaceId)
-				.eq(SaasRole::getOwnerOuId, ouId)
-				.eq(SaasRole::getIsDelete, TableIsDeleteEnum.NORMAL.value)
-				.last(" limit 1").one();
-	}
-
-	public List<SaasRole> listCommonRoleByNameAndWorkspaceIdAndOuId(String name, Long workspaceId,
-																	Long ouId) {
-		return lambdaQuery().eq(SaasRole::getName, name)
-				.eq(SaasRole::getWorkspaceId, workspaceId)
-				.eq(SaasRole::getOwnerOuId, ouId)
-				.eq(SaasRole::getRoleType, RoleTypeEnum.COMMON.getValue())
-				.eq(SaasRole::getIsDelete, TableIsDeleteEnum.NORMAL.value)
-				.select(SaasRole::getId)
-				.list();
-	}
-
 	public List<SaasRole> findRoleByName(Long ouId, Long workspaceId,List<Long> roleIds,
 										 List<String> roleNames) {
 		return this.lambdaQuery().select(SaasRole::getId, SaasRole::getName, SaasRole::getRoleType)
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java
index 470a9081..74e8eed7 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java
@@ -54,13 +54,6 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
             .update();
     }
 
-    /** 弃用category_code 通过角色组层级实现 **/
-    @Deprecated
-    public List<SaasRoleGroup> listByCategoryCode(List<String> categoryCode) {
-        return lambdaQuery().eq(BaseEntity::getIsDelete, 0L)
-                .in(SaasRoleGroup::getCategoryCode, categoryCode).list();
-    }
-
     public List<SaasRoleGroup> listByCodes(List<String> codes) {
         return lambdaQuery().eq(BaseEntity::getIsDelete, 0L)
                 .in(SaasRoleGroup::getCode, codes).list();
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
index 91695195..1569d96b 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
@@ -2,7 +2,6 @@ package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.karma.client.model.dto.ProjectWorkBaseDTO;
-import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
 import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.enums.SaasJobTypeEnum;
@@ -32,16 +31,6 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
 	@Autowired
 	private SaasRoleUserRelationMapper saasRoleUserRelationMapper;
 
-	public List<SaasRoleUserRelation> query(Long identityId, Integer identityType, Long workspaceId, Long ouId) {
-		return this.lambdaQuery()
-				.eq(SaasRoleUserRelation::getIdentityId, identityId)
-				.eq(SaasRoleUserRelation::getIdentityType, identityType)
-				.eq(null != workspaceId, SaasRoleUserRelation::getWorkspaceId, workspaceId)
-				.eq(null != ouId, SaasRoleUserRelation::getOuId, ouId)
-				.eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value)
-				.list();
-	}
-
 	public void deleteById(List<Long> ids) {
 		if (CollUtil.isEmpty(ids)) {
 			return;
@@ -154,11 +143,6 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
 
 	public void delByIdentityAndWorkspaceIdAndOuId(Long identityId, cn.axzo.basics.profiles.common.enums.IdentityType identityType, Long workspaceId, Long ouId) {
 		getBaseMapper().deleteButNotAdminAndNotLeader(workspaceId, ouId, identityId, identityType, null);
-//		lambdaUpdate().eq(SaasRoleUserRelation::getWorkspaceId, workspaceId)
-//				.eq(SaasRoleUserRelation::getIdentityId, identityId)
-//				.eq(SaasRoleUserRelation::getIdentityType, identityType)
-//				.eq(SaasRoleUserRelation::getOuId, ouId)
-//				.set(SaasRoleUserRelation::getIsDelete, TableIsDeleteEnum.DELETE.value).update();
 	}
 
 	public List<SaasRoleUserRelation> findBathSuperAdmin(List<ProjectWorkBaseDTO> req) {