Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-27 1887d987b747628fe8839c1d8447f5b5cbc862d4

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -435,7 +435,7 @@
                 select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                      where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                     '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                         transaction_num views,2 type from automessage_transaction_event
                         browse_num views,2 type from automessage_transaction_event
             ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>
@@ -452,7 +452,7 @@
       select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                  where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                 '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
        transaction_num views ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
               browse_num views ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
    </select>

    <select id="selectSearchAssociateDistinct" resultType="com.dg.core.db.manual.pojo.Search" >