Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_admin

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

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

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

@@ -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=='进行中'">