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

lidongdong

2022-11-25 01b70437d4ef3348e69b2af0dcbd7250e1234117

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

@@ -156,11 +156,12 @@
                AND user_type=#{userType}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                AND
                <foreach collection="ids" item="param"  open="(" close=")" separator="or">
                     locate(#{param},more_department_ids)>0
                </foreach>
            </if>

            <if test="isDivisionHead != null and isDivisionHead != ''">
                and is_division_head=#{isDivisionHead}
            </if>