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

lidongdong

2022-10-09 e76d382202ed5c8286b09593e05b2c36acde1c0f

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

@@ -76,6 +76,12 @@
            <if test="matterName != null and matterName != ''">
                AND matter_name like concat('%', #{matterName}, '%')
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        order by  update_time desc ,  create_time desc
    </select>
@@ -86,6 +92,12 @@
            <if test="matterName != null and matterName != ''">
                AND matter_name like   concat('%', #{matterName}, '%')
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>