From bd41ff0f28179465c92ace08d37764f98591d8e4 Mon Sep 17 00:00:00 2001
From: violateer <1828257089@qq.com>
Date: Sat, 2 Aug 2025 22:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93=E8=A7=92=E8=89=B2=E7=BB=84=E6=97=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/ruoyi/domain/KnowledgeRole.java    |  3 +--
 .../java/org/ruoyi/domain/KnowledgeRoleGroup.java    |  3 +--
 .../service/impl/KnowledgeRoleGroupServiceImpl.java  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRole.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRole.java
index dbb7d61c..100987f4 100644
--- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRole.java
+++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRole.java
@@ -2,7 +2,6 @@ package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -44,7 +43,7 @@ public class KnowledgeRole extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
+    // @TableLogic
     private String delFlag;
 
     /**
diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleGroup.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleGroup.java
index 02fb0241..48475e76 100644
--- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleGroup.java
+++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleGroup.java
@@ -1,7 +1,6 @@
 package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,7 +36,7 @@ public class KnowledgeRoleGroup extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
+    // @TableLogic
     private String delFlag;
 
     /**
diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleGroupServiceImpl.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleGroupServiceImpl.java
index 9cf2daa2..6df9e7b5 100644
--- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleGroupServiceImpl.java
+++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleGroupServiceImpl.java
@@ -8,16 +8,19 @@ import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.core.page.PageQuery;
 import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.KnowledgeRole;
 import org.ruoyi.domain.KnowledgeRoleGroup;
 import org.ruoyi.domain.bo.KnowledgeRoleGroupBo;
 import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
 import org.ruoyi.mapper.KnowledgeRoleGroupMapper;
+import org.ruoyi.mapper.KnowledgeRoleMapper;
 import org.ruoyi.service.IKnowledgeRoleGroupService;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 知识库角色组Service业务层处理
@@ -30,6 +33,8 @@ import java.util.Map;
 public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService {
 
     private final KnowledgeRoleGroupMapper baseMapper;
+    private final KnowledgeRoleMapper knowledgeRoleMapper;
+    private final KnowledgeRoleServiceImpl knowledgeRoleServiceImpl;
 
     /**
      * 查询知识库角色组
@@ -104,6 +109,13 @@ public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+
+        // 查询role表
+        LambdaQueryWrapper<KnowledgeRole> lqwState = Wrappers.lambdaQuery();
+        lqwState.in(KnowledgeRole::getGroupId, ids);
+        List<KnowledgeRole> knowledgeRoles = knowledgeRoleMapper.selectList();
+        knowledgeRoleServiceImpl.deleteWithValidByIds(knowledgeRoles.stream().map(KnowledgeRole::getId).collect(Collectors.toList()), true);
+
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 }