Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -121,7 +121,7 @@
 	</select>
 
     <select id="queryByOrganId" resultMap="CooperationOrgan">
-        SELECT * FROM cooperation_organ WHERE FIND_IN_SET(organ_id_,#{organId}) AND del_flag_ != 1
+        SELECT * FROM cooperation_organ WHERE FIND_IN_SET(organ_id_,#{organId}) AND del_flag_ != 1 AND is_enable_ = 1
     </select>
 
     <select id="queryNameByIds" resultType="java.util.Map">