bug修复3

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);
+//        List<QcMaterialGroup> children = qcMaterialGroupService.getMaterialChildrenList(parent);
-        boolean hasRule = qcMaterialGroupService.validationData(id);
+//        boolean hasRule = qcMaterialGroupService.validationData(id);
-        if (!children.isEmpty()) {
+//        if (!children.isEmpty()) {
-            return AjaxResult.error("此节点下含有子节点，请先删除子节点");
+//            return AjaxResult.error("此节点下含有子节点，请先删除子节点");
-        } else if (hasRule) {
+//        } else if (hasRule) {
-            return AjaxResult.error("此节点含有检验规则，请先删除检验规则");
+//            return AjaxResult.error("此节点含有检验规则，请先删除检验规则");
-        } else {
+//        } else {
             return toAjax(qcMaterialGroupService.deleteQcMaterialGroupById(id));
-        }
+//        }
     }
 }

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);
 }

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);
     }
 

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,