From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 27 六月 2025 18:07:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml index b2a12d9..f0e6e0a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml @@ -43,6 +43,15 @@ <if test="query.status != null"> and tir.status = #{query.status} </if> + <if test="query.dispatchIds != null and query.dispatchIds.size() > 0"> + and tir.dispatch_id in + <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="("> + #{item} + </foreach> + </if> + <if test="query.roleType != null and query.roleType == 4"> + and tir.status = 1 + </if> <if test="query.status == null"> and tir.status != -1 </if> -- Gitblit v1.7.1