Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-09 02c29352ed99217a5669335a12cb2b4f1dedb2d5

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

@@ -153,10 +153,12 @@
        <include refid="selectTransactionEventList"/>
        <where>
            <if test="keyword != null and keyword != ''">
                AND (matter_name like concat('%', #{keyword}, '%')) or
                AND (
                    (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                    or (associate_names like concat('%', #{keyword}, '%'))
                    )

            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}