From c9f61c2501729272827ba8e42df1b6a516444d58 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 23 Jul 2024 17:51:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QcMaterialGroupController.java    | 16 ++++++++--------
 .../op/quality/mapper/QcMaterialGroupMapper.java |  2 ++
 .../service/impl/QcMaterialGroupServiceImpl.java |  1 +
 .../mapper/quality/QcMaterialGroupMapper.xml     |  3 +++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
index 1506d925..27284088 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
@@ -109,14 +109,14 @@ public class QcMaterialGroupController extends BaseController {
     public AjaxResult remove(@PathVariable String id) {
         QcMaterialGroup parent = new QcMaterialGroup();
         parent.setId(id);
-        List<QcMaterialGroup> children = qcMaterialGroupService.getMaterialChildrenList(parent);
-        boolean hasRule = qcMaterialGroupService.validationData(id);
-        if (!children.isEmpty()) {
-            return AjaxResult.error("此节点下含有子节点，请先删除子节点");
-        } else if (hasRule) {
-            return AjaxResult.error("此节点含有检验规则，请先删除检验规则");
-        } else {
+//        List<QcMaterialGroup> children = qcMaterialGroupService.getMaterialChildrenList(parent);
+//        boolean hasRule = qcMaterialGroupService.validationData(id);
+//        if (!children.isEmpty()) {
+//            return AjaxResult.error("此节点下含有子节点，请先删除子节点");
+//        } else if (hasRule) {
+//            return AjaxResult.error("此节点含有检验规则，请先删除检验规则");
+//        } else {
             return toAjax(qcMaterialGroupService.deleteQcMaterialGroupById(id));
-        }
+//        }
     }
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java
index 112a74f9..40c3e5e1 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java
@@ -68,4 +68,6 @@ public interface QcMaterialGroupMapper {
     public List<QcMaterialGroup> validationData(String id);
 
     String selectGroupIdByName(String groupName);
+
+    void deleteGroupDetailById(String id);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java
index 9eded988..8ab5580a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java
@@ -191,6 +191,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService {
     @Override
     @DS("#header.poolName")
     public int deleteQcMaterialGroupById(String id) {
+        qcMaterialGroupMapper.deleteGroupDetailById(id);
         return qcMaterialGroupMapper.deleteQcMaterialGroupById(id);
     }
 
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
index 054abf1e..e327235d 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
@@ -126,6 +126,9 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteGroupDetailById">
+        delete from qc_material_group_detail where group_id = #{id}
+    </delete>
     <select id="validationData" parameterType="String" resultMap="QcMaterialGroupResult">
 		select
 		    id,