Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-07 8eca18fd0d9f96e56e2262b31dade4f729b7d1f7

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

@@ -441,9 +441,10 @@
    </select>

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select  id, title, content,classify_id, type  from   ( select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
        select  id, title, content,classify_id, type,parentClassifyId  from   ( 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,classify_id,
                                                                                                   '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                                                                   classify_id,(select parent_id from automessage_classify_administration  where id=automessage_transaction_event.classify_id) parentClassifyId,
                                                                       2 type from automessage_transaction_event) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content like concat('%',#{keyWord}, '%')
    </select>