Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 7c52db14463d35f92e9339735feaf872ca00c48d

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

@@ -99,7 +99,15 @@

    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         where department_id=#{departmentId} and master_ids like concat('%',#{classifyId}, '%')
         <where>
        <if test="list!=null">
           department_id in
        <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
         </if>
         and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         </where>
    </select>