From 5d2d6fdff67f8f9a7e65abdbb4b87dba07dcb32b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 02 九月 2025 10:23:02 +0800
Subject: [PATCH] 上传修改
---
ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index 5e615c6..eca8971 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -46,7 +46,7 @@
<if test="query.status == null">
AND t1.status != -1
</if>
- <if test="query.teamIds != null and query.teamIds > 0">
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
AND t1.team_id in
<foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
#{id}
@@ -154,6 +154,9 @@
<if test="query.userId != null">
and tedp.user_id = #{query.userId}
</if>
+ <if test="query.userId != null">
+ and trwe.user_id = #{query.userId}
+ </if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND trwe.evaluate_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
@@ -187,6 +190,9 @@
<if test="query.userId != null">
and tedp.user_id = #{query.userId}
</if>
+ <if test="query.userId != null">
+ and trwe.user_id = #{query.userId}
+ </if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND trwe.evaluate_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
--
Gitblit v1.7.1