Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046

2024-01-16 15:56:07 +08:00 · 2024-01-16 15:56:07 +08:00 · 7c7c6bc852
commit 7c7c6bc852
parent 9c558f8d84 56a265a8fb
1 changed files with 1 additions and 0 deletions
--- 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
@ -95,6 +95,7 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
 				.eq(SaasRoleUserRelation::getIdentityType, identityType)
 				.eq(SaasRoleUserRelation::getWorkspaceId, workspaceId)
 				.eq(SaasRoleUserRelation::getOuId, ouId)
+				.eq(SaasRoleUserRelation::getIsDelete, TableIsDeleteEnum.NORMAL.value)
 				.setSql(" is_delete = id")
 				.update();
 	}