This commit is contained in:
Vinjor 2025-05-06 13:26:08 +08:00
parent fcefa000bf
commit e2975ea46b
2 changed files with 8 additions and 1 deletions

View File

@ -45,5 +45,4 @@ public class AppNoticeQuery {
private String cityName; private String cityName;
} }

View File

@ -316,6 +316,10 @@ order by dbns.create_time desc
WHERE WHERE
dbn.del_flag = 0 dbn.del_flag = 0
AND (dbn.approval_status = '1') AND (dbn.approval_status = '1')
<if test="entity.searchValue!=null and entity.searchValue!='' ">
AND (dbn.title LIKE CONCAT('%',#{entity.searchValue},'%') OR
dbn.gift_detail LIKE CONCAT('%',#{entity.searchValue},'%'))
</if>
<if test="entity.reportStatus!=null and entity.reportStatus!='' "> <if test="entity.reportStatus!=null and entity.reportStatus!='' ">
<choose> <choose>
<when test="entity.reportStatus=='审核中'"> <when test="entity.reportStatus=='审核中'">
@ -356,6 +360,10 @@ order by dbns.create_time desc
LEFT join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0 LEFT join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0
WHERE WHERE
dbn.del_flag = 0 and dbn.approval_status !=8 and dbn.user_id = #{entity.userId} dbn.del_flag = 0 and dbn.approval_status !=8 and dbn.user_id = #{entity.userId}
<if test="entity.searchValue!=null and entity.searchValue!='' ">
AND (dbn.title LIKE CONCAT('%',#{entity.searchValue},'%') OR
dbn.gift_detail LIKE CONCAT('%',#{entity.searchValue},'%'))
</if>
<if test="entity.status!=null and entity.status!='' "> <if test="entity.status!=null and entity.status!='' ">
<choose> <choose>
<when test="entity.status=='进行中'"> <when test="entity.status=='进行中'">