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/TTestMethodConfirmSheetOriginalMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml index c63ae2d..aa50039 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml @@ -44,9 +44,12 @@ <if test="query.createBy != null and query.createBy != ''"> and ttmcso.create_by like concat('%', #{query.createBy}, '%') </if> - <if test="query.status != null"> + <if test="query.status != null and query.status != -1"> and ttmcso.status = #{query.status} </if> + <if test="query.status == null"> + and ttmcso.status != -1 + </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND ttmcso.create_time BETWEEN #{query.startTime} AND #{query.endTime} </if> -- Gitblit v1.7.1