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

yanghui

2022-10-19 e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa

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

@@ -156,6 +156,7 @@
                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}
@@ -325,6 +326,7 @@
                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 classify_administration where classify_grade.id=classify_id) = #{classifyGrade}