From 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 28 七月 2023 15:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
index a897e11..77d15a2 100644
--- a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
@@ -20,17 +20,17 @@
where a.state = 1 and a.appUserId = #{uid} and a.payStatus != 1
<!--1=未开始，2=进行中，3=已结束，4=已取消-->
<if test="null != type and 1 == type">
- and b.status = 1
+ and b.status = 1 and a.payStatus = 2
</if>
<if test="null != type and 2 == type">
- and b.status = 2
+ and b.status = 2 and a.payStatus = 2
</if>
<if test="null != type and 3 == type">
- and b.status = 3
+ and b.status = 3 and a.payStatus = 2
</if>
<if test="null != type and 4 == type">
and a.payStatus = 3
</if>
- order by a.insertTime desc limit #{pageSize}, #{pageNo}
+ order by a.insertTime desc limit #{pageNo}, #{pageSize}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1