教研详情，公开模式

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

@@ -110,7 +110,7 @@ public interface ResearchUserMapper extends TkMapper<TResearchUser> {
     List<Map<String, String>> listUserByRidAndSid(@Param("researchid") Integer researchid, @Param("schoolid") Integer schoolid);
 
     //教研学校用户
-    List<Map> listReaearchSchools(@Param("researchid") Integer researchid, @Param("schoolid") Integer schoolid);
+    List<Map> listReaearchSchools(@Param("researchid") Integer researchid,@Param("publiced") Integer publiced, @Param("schoolid") Integer schoolid);
 
     //根据教研教师id获取教研截至时间
     TResearch getResearchStoptime(@Param("ruid") Integer ruid);

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

@@ -74,9 +74,10 @@ public class ResearchUserService {
             messageSender.convertVideo(researchUserVo.getResearchid(), researchUserVo.getResearchpath());
         }
 
-        // 如果教研是公开的，则获取所有已提交教研
-        if (researchUserVo.getPubliced() == 0) {
-            List<Map> schools = researchUserMapper.listReaearchSchools(researchid, researchUserVo.getSchoolid());
+        int publiced = researchUserVo.getPubliced();
+        // 如果教研是公开的，则获取所有已提交教研publiced：是否公开0不公开1校内公开2全部公开
+        if (publiced > 0) {
+            List<Map> schools = researchUserMapper.listReaearchSchools(researchid,publiced, researchUserVo.getSchoolid());
             // 去除学校中未参与评价教师
             for (int i = 0; i < schools.size(); i++) {
                 List<Map> commitRusers = new ArrayList<>();

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

@@ -105,7 +105,11 @@
         u.username createname,u.headpic
         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} order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
+        where ru.researchid=#{researchid}
+        <if test="publiced!=null and publiced==1">
+            and ru.schoolid=#{schoolid}
+        </if>
+        order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
     </select>
 
     <!--根据教研教师id获取教研截至时间-->