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

yanghui

2022-10-20 36ad4a7119b7f17b574cdbb6cf470a43e53831b0

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

@@ -97,6 +97,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND a.guide_user_id=#{guideUserId}
            </if>
        </where>
        order by  update_time desc ,  create_time desc
    </select>
@@ -118,6 +121,9 @@
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND a.guide_user_id=#{guideUserId}
            </if>
        </where>
    </select>
@@ -198,6 +204,9 @@
            <if test="evaluateState != null and evaluateState != ''">
                and evaluate_state=#{evaluateState}
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND guide_user_id=#{guideUserId}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">