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

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

@@ -122,7 +122,7 @@
     <select id="queryByOrganId" resultMap="School">
         SELECT * FROM school
         <where>
-            del_flag_ != 1 and user_id_ is null
+            del_flag_ = 0 and user_id_ is null
             <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>