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

Compare commits

base: dianliang:56c1c93f7c753464ab37bd29bee28b42c26a2618
Branches Tags
dianliang:master
..
compare: dianliang:570e07d720be8ba56bbf567d76fc8a3e626765db
Branches Tags
dianliang:master

No commits in common. "56c1c93f7c753464ab37bd29bee28b42c26a2618" and "570e07d720be8ba56bbf567d76fc8a3e626765db" have entirely different histories.
56c1c93f7c ... 570e07d720

2 changed files with 1 additions and 8 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -316,10 +316,6 @@ 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=='审核中'">
@ -360,10 +356,6 @@ 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=='进行中'">