Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-10-24 07c7f39a97f4ea8f84d32e2e2075dfc9d6a1dd04

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

@@ -107,6 +107,12 @@
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>

@@ -133,7 +139,12 @@
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </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>