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/TExperimentSchemeMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
index b0b5564..135dcc4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -50,7 +50,7 @@
and tpp.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
- and tes.experiment_code like concat('%', #{query.experimentCode}, '%')
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tes.create_time BETWEEN #{query.startTime} AND #{query.endTime}
@@ -60,6 +60,9 @@
<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
#{item}
</foreach>
+ </if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tes.status != 5
</if>
<if test="query.status == null">
and tes.status != -1
@@ -85,7 +88,7 @@
and tpp.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
- and tes.experiment_code like concat('%', #{query.experimentCode}, '%')
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tes.create_time BETWEEN #{query.startTime} AND #{query.endTime}
--
Gitblit v1.7.1