From f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 06 九月 2024 11:58:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/flower/FlowerMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 3ebf9f8..5a0b0c1 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -373,6 +373,11 @@
</if>
ORDER BY fzp.rank asc
</select>
+ <select id="searchInvalidHistory" resultType="java.lang.Long">
+ SELECT c.id
+ FROM t_browse_his c left join t_flower f on c.flower_id = f.id
+ WHERE f.deleted = 0 and c.deleted = 0 and f.status != 'UP' and c.user_id = #{userId}
+ </select>
<update id="updateFlowerCategoryInfo">
update t_flower f, t_flower_category fc
--
Gitblit v1.9.3