Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-10-26 8807d2fb74fc824ba6a0b0a14c9e3c246479eaab

Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

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

@@ -441,14 +441,11 @@
    </select>

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select distinct   classify_id, content, type   FROM(
           select id,classify_name title,ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content,id classify_id,4 type  from automessage_classify_administration c UNION

           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,
                   2 type from automessage_transaction_event) k
        where  k.title like concat('%',#{keyWord}, '%')
        select  id, title, content,classify_id, type  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,
                                                                       2 type from automessage_transaction_event) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content like concat('%',#{keyWord}, '%')
    </select>

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