教学点管理调整

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

@@ -96,6 +96,11 @@
         SELECT s.*,su.real_name_ FROM school s
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE s.del_flag_ != 1
+        <include refid="queryPageSql"/>
+        ORDER BY s.id_
+        <include refid="global.limit"/>
+    </select>
+    <sql id="queryPageSql">
         <if test="cooperationOrganId != null">
             AND s.cooperation_organ_id_ = #{cooperationOrganId}
         </if>
@@ -113,22 +118,13 @@
         <if test="search != null">
             AND (s.name_ LIKE CONCAT('%',#{search},'%') OR s.id_ LIKE CONCAT('%',#{search},'%'))
         </if>
-        ORDER BY s.id_
-        <include refid="global.limit"/>
-    </select>
-
+    </sql>
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM school where del_flag_ != 1
-        <if test="cooperationOrganId != null">
-            AND cooperation_organ_id_ = #{cooperationOrganId}
-        </if>
-        <if test="organId != null">
-            AND FIND_IN_SET(organ_id_,#{organId})
-        </if>
-        <if test="search != null">
-            AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ LIKE CONCAT('%',#{search},'%'))
-        </if>
+        SELECT COUNT(s.id_) FROM school s
+        LEFT JOIN sys_user su ON su.id_ = s.user_id_
+        WHERE s.del_flag_ != 1
+        <include refid="queryPageSql"/>
 	</select>
     <select id="queryByOrganId" resultMap="School">
         SELECT * FROM school