Merge branch '2021-07-19_children' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -163,8 +163,8 @@
     </select>
     <sql id="queryPageSql">
         <where>
-            <if test="organId != null">
-                AND su.organ_id_ = #{organId}
+            <if test="organId != null and organId != ''">
+                AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
             <if test="search != null and search != ''">
                 AND (s.user_id_ = #{search} OR su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))