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/TSamplingRecordMapper.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml index b4fa15d..a8c9f87 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml @@ -53,6 +53,9 @@ #{item} </foreach> </if> + <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)"> + AND tsr.status != 3 + </if> <if test="query.status == null"> and tsr.status != -1 </if> -- Gitblit v1.7.1