From cf65d0a608b21f07dc50a98b864dfe47def4f86b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 17:12:37 +0800
Subject: [PATCH] fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除
---
src/main/resources/mapper/quality/RawMaterialMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/quality/RawMaterialMapper.xml b/src/main/resources/mapper/quality/RawMaterialMapper.xml
index cddecc6..da34144 100644
--- a/src/main/resources/mapper/quality/RawMaterialMapper.xml
+++ b/src/main/resources/mapper/quality/RawMaterialMapper.xml
@@ -22,21 +22,21 @@
FROM raw_material rm
LEFT JOIN product_model pm ON rm.product_model_id = pm.id
LEFT JOIN product p ON p.id = pm.product_id
- where
- 1=1
- <if test="params.checkType != null ">
+ WHERE p.id IS NOT NULL
+ AND rm.id IS NOT NULL
+ <if test="params.checkType != null">
AND rm.check_type = #{params.checkType}
</if>
<if test="params.batchNo != null and params.batchNo != ''">
- and rm.batch_no like concat('%', #{params.batchNo}, '%')
+ AND rm.batch_no LIKE CONCAT('%', #{params.batchNo}, '%')
</if>
- <if test="params.inspectState != null ">
+ <if test="params.inspectState != null">
AND rm.inspect_state = #{params.inspectState}
</if>
- <if test="params.entryDateStart != null and params.entryDateStart != '' ">
+ <if test="params.entryDateStart != null and params.entryDateStart != ''">
AND rm.check_time >= #{params.entryDateStart}
</if>
- <if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
+ <if test="params.entryDateEnd != null and params.entryDateEnd != ''">
AND rm.check_time <= #{params.entryDateEnd}
</if>
ORDER BY rm.check_time DESC
--
Gitblit v1.9.3