解决知识库查询 错误的问题

soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysLearningMaterialsMapper.xml

@@ -332,7 +332,7 @@
         inner join sys_user u on u.id=m.create_by
         where m.deleted = 0 and k.deleted = 0 and m.org_id=#{request.curOrgId} and m.is_open = 1
         <include refid="pageRequest"/>
-        or(m.deleted = 0 and k.deleted = 0 and  m.create_by=#{request.userId})
+        or(m.deleted = 0 and k.deleted = 0 and  m.create_by=#{request.userId}  <include refid="pageRequest"/>)
     </select>
     <select id="selectPageData3" resultType="com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsPageVo">
         select
@@ -340,9 +340,8 @@
         from sys_learning_materials m
         inner join sys_knowledge k on m.knowledge_id = k.id
         inner join sys_user u on u.id=m.create_by
-        where( m.deleted = 0 and k.deleted = 0 and m.org_id=#{request.curOrgId} and m.is_open = 1)
-        <include refid="pageRequest"/>
-        or(m.deleted = 0 and k.deleted = 0 and m.create_by=#{request.userId})
+        where( m.deleted = 0 and k.deleted = 0 and m.org_id=#{request.curOrgId} and m.is_open = 1  <include refid="pageRequest"/>)
+        or(m.deleted = 0 and k.deleted = 0 and m.create_by=#{request.userId}  <include refid="pageRequest"/>)
         or(m.deleted = 0 and k.deleted = 0 and m.org_path like concat(#{request.orgPath},'%') and m.is_open = 1<include refid="pageRequest"/>)
     </select>
     <select id="selectPageData4" resultType="com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsPageVo">
@@ -351,9 +350,8 @@
         from sys_learning_materials m
         inner join sys_knowledge k on m.knowledge_id = k.id
         inner join sys_user u on u.id=m.create_by
-        where (m.deleted = 0 and k.deleted = 0 and m.org_id=#{request.curOrgId} and m.is_open = 1)
-        <include refid="pageRequest"/>
-        or(m.deleted = 0 and k.deleted = 0 and m.create_by=#{request.userId})
+        where ( m.deleted = 0 and k.deleted = 0 and m.org_id=#{request.curOrgId} and m.is_open = 1 <include refid="pageRequest"/> )
+        or(m.deleted = 0 and k.deleted = 0 and m.create_by=#{request.userId} <include refid="pageRequest"/>)
         or(m.deleted = 0 and k.deleted = 0 and m.org_path like concat(#{request.orgPath},'%') and m.is_open = 1<include refid="pageRequest"/>)
         <!--父级公开数据-->
         or(m.deleted = 0 and k.deleted = 0 and  m.org_id in <foreach collection="request.orgIdList" item="item" open="(" separator="," close=")">