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

lidongdong

2022-10-09 e76d382202ed5c8286b09593e05b2c36acde1c0f

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

@@ -125,6 +125,12 @@
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        order by create_time desc
    </select>
@@ -268,6 +274,12 @@
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>