Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-27 61e78131b88698cf180b947f9486b70213140f90

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

@@ -46,8 +46,8 @@
            parent_id=#{parentId}
            <if test="departmentId!=null">
                and id in (
                select classify_id from  transaction_event where department_id=#{departmentId} UNION
                select parent_id from  classify_administration   where id in (select classify_id FROM  transaction_event where department_id=#{departmentId})   )
                select classify_id from  automessage_transaction_event where department_id=#{departmentId} UNION
                select parent_id from  automessage_classify_administration   where id in (select classify_id FROM  automessage_transaction_event where department_id=#{departmentId})   )
            </if>
        </where>
    </select>