dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
13405411873 2025-05-06 13:32:15 +08:00
commit d7474209c0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java
View File

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

8
ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
View File

@ -316,6 +316,10 @@ order by dbns.create_time desc
WHERE
dbn.del_flag = 0
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!='' ">
<choose>
<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
WHERE
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!='' ">
<choose>
<when test="entity.status=='进行中'">