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

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

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

@@ -19,7 +19,6 @@
        <id     property="updateUserId"      column="update_user_id"      />
        <id     property="areaList"      column="area_list"      />


    </resultMap>

    <sql id="selectOrganizationChartVo">
@@ -89,10 +88,15 @@
            <if test="parentId != null and parentId != ''">
                AND parent_id=#{parentId}
            </if>

            <if test="grade != null and grade != ''">
                AND grade=#{grade}
            </if>
            <if test="ids != null">
                and id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>