Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -110,7 +110,7 @@
 				AND tenant_id_ = #{tenantId}
 			</if>
 			<if test="organId != null">
-				AND id_ != #{organId}
+				AND parent_organ_id_ = #{organId}
 			</if>
 			<if test="organIds != null">
 				AND id_ IN