Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-27 b0c427488d8cbc46075fd71ad14b19516632cd5a

Merge branch 'zigonggao_dev' into huacheng_test

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

@@ -49,7 +49,7 @@
            parent_id=#{parentId}
            <if test="departmentId!=null">
                and id in (
                select classify_id from  automessage_transaction_event where department_id=#{departmentId} UNION
                select classify_id from  automessage_transaction_event where department_id in (select id from automessage_organization_chart where id=#{departmentId}  or parent_id=#{departmentId}) UNION
                select parent_id from  automessage_classify_administration
                where id in (select classify_id FROM automessage_transaction_event
                where department_id in (select id from automessage_organization_chart where id=#{departmentId}  or parent_id=#{departmentId}))  )