From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 20 五月 2025 18:52:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml index 8b04a82..e9ba188 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml @@ -40,9 +40,12 @@ <if test="query.experimentCode != null and query.experimentCode !=''"> and ted.experiment_code like concat('%', #{query.experimentCode}, '%') </if> - <if test="query.auditStatus != null and query.auditStatus != ''"> + <if test="query.auditStatus != null and query.auditStatus != -1"> and tmcs.audit_status = #{query.auditStatus} </if> + <if test="query.auditStatus == null"> + and tmcs.audit_status != -1 + </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND tmcs.create_time BETWEEN #{query.startTime} AND #{query.endTime} </if> -- Gitblit v1.7.1