背诵、预习列表完善

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/GuideController.java

@@ -50,6 +50,9 @@ public class GuideController {
         Map<String, String> map = classService.getQxClassidsByTeacherid(createid);
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));
+        if (N_Utils.isEmpty(guide.getSchoolid())) {
+            guide.setSchoolid(N_Utils.str2Int(map.get("userschoolid")));
+        }
         PageHelper.startPage(page, pageSize);
         List<GuideVo> list = guideService.listGuidesForTeacherWeb(guide);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
@@ -67,6 +70,9 @@ public class GuideController {
         Map<String, String> map = classService.getQxClassidsByTeacherid(createid);
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));
+        if (N_Utils.isEmpty(guide.getSchoolid())) {
+            guide.setSchoolid(N_Utils.str2Int(map.get("userschoolid")));
+        }
         guide.setPage((page - 1)*pageSize);
         List<Map> list = guideService.listGuidesForTeacherApp(guide);
         return new ResultVo(0,"获取教师预习列表成功",list);

sstudy/src/main/resources/mapper/recite/ReciteMapper.xml

@@ -51,8 +51,8 @@
         left join t_class_teacher ct on rg.classid=ct.classid
         left join t_teacher_subjectbook ts on ct.teacherid=ts.teacherid
         where ct.teacherid=#{recite.createid} and r.subjectid=ts.subjectid
-        and ((r.hashb=1 and rg.classid in (${recite.classids})) or
-        (r.hashb=0 and rg.classid in (${recite.bxclassids})))
+        and ((r.hashb=1 and r.schoolid=#{recite.schoolid} and rg.classid in (${recite.classids})) or
+        (rg.classid in (${recite.bxclassids})))
         <if test="recite.recitestate==1">
             AND rg.stoptime<![CDATA[ >= ]]>#{recite.nowtime}
         </if>

sstudy/src/main/resources/mapper/resource/GuideMapper.xml

@@ -21,8 +21,8 @@
         from t_guide g left join t_guide_resource gr on g.guideid=gr.guideid
         left join t_guide_group gg on g.guideid = gg.guideid
         where g.subjectid=#{guide.subjectid}
-        and ((g.hashb=1 and gg.classid in (${guide.classids})) or
-        (g.hashb=0 and gg.classid in (${guide.bxclassids})))
+        and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
+        (gg.classid in (${guide.bxclassids})))
         <if test="guide.lsbid!=null and guide.lsbid!='' and guide.lsbid!='0'.toString()">
             and g.lsbid = #{guide.lsbid}
         </if>
@@ -50,8 +50,8 @@
         left join t_resource r on gr.resourceid=r.resourceid
         left join t_guide_group gg on g.guideid = gg.guideid
         where g.subjectid=#{guide.subjectid}
-        and ((g.hashb=1 and gg.classid in (${guide.classids})) or
-        (g.hashb=0 and gg.classid in (${guide.bxclassids})))
+        and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
+        (gg.classid in (${guide.bxclassids})))
         <if test="guide.lsbid!=null and guide.lsbid!='' and guide.lsbid!='0'.toString()">
             and g.lsbid = #{guide.lsbid}
         </if>