From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 16:35:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml index 78bfe7a..212e574 100644 --- a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml +++ b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml @@ -26,7 +26,10 @@ update_time, memo FROM man_qly_ispt_item qii - LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id) t + LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id + where qii.deleted = 0 + ) t + ${ew.customSqlSegment} </select> <select id="selectIsptResult" resultType="com.vincent.rsf.server.manager.entity.QlyIsptItem"> @@ -53,7 +56,10 @@ update_by, update_time, memo - FROM man_qly_ispt_item qii) t + FROM man_qly_ispt_item qii + where qii.deleted = 0 + ) t + ${ew.customSqlSegment} </select> -- Gitblit v1.9.1