Merge remote-tracking branch 'origin/wn' into ywx

sapi/src/main/java/com/xhkjedu/sapi/controller/research/ResearchUserController.java

             research.setRorder("stoptime");
         }
         PageHelper.startPage(research.getPage(), research.getPageSize());
-        List<Map> list = researchUserService.listRusersByReaearchid(research.getResearchid());
+        List<Map> list = researchUserService.listRusersByReaearchid(research.getResearchid(),research.getSchoolid());
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取教研用户列表成功",pageResult);
     }

sapi/src/main/java/com/xhkjedu/sapi/mapper/research/ResearchUserMapper.java

      * @param  * @param researchid
      * @return java.util.List<com.xhkjedu.model.research.TResearchUser>
      */
-    List<Map> listRusersByReaearchid(@Param("researchid") Integer researchid);
+    List<Map> listRusersByReaearchid(@Param("researchid") Integer researchid,@Param("schoolid") Integer schoolid);
 
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchUserService.java

      * @param  * @param researchid
      * @return java.util.List<com.xhkjedu.model.research.TResearchUser>
      */
-    public List<Map> listRusersByReaearchid(Integer researchid){
-        return researchUserMapper.listRusersByReaearchid(researchid);
+    public List<Map> listRusersByReaearchid(Integer researchid,Integer schoolid){
+        return researchUserMapper.listRusersByReaearchid(researchid,schoolid);
     }
 
     /**
         if (!researchUserVo.getMp4code().equals("h264")) {
             messageSender.convertVideo(researchUserVo.getResearchid(), researchUserVo.getResearchpath());
         }
+
         return researchUserVo;
     }
 

sapi/src/main/resources/mapper/research/ResearchUserMapper.xml

         u.headpic,ru.schoolid,s.schoolname
         FROM t_research_user ru LEFT JOIN t_user u ON ru.userid=u.userid
         left join t_school s on ru.schoolid=s.schoolid
-        WHERE ru.researchid=#{researchid} AND ru.rustate=1 ORDER BY ru.reviewtime desc
+        WHERE ru.researchid=#{researchid} AND ru.rustate=1
+        <if test="schoolid!=null and schoolid!=0">
+            and ru.schoolid=#{schoolid}
+        </if>
+        ORDER BY ru.reviewtime desc
     </select>
 
     <!-- 教师参与教研列表 -->