Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0810

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -778,7 +778,7 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     public Map<String, Integer> sumStudentAttendance(Integer courseScheduleId) {
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
-        Map<String, Integer> sum = new HashMap<>(5);
+        Map<String, Integer> sum = new HashMap<>(7);
         Integer studentNum = scheduleStudentPaymentDao.countStudentNum(courseScheduleId);
         sum.put("studentNum", studentNum);
         Integer signInNum = studentManageDao.countStudentSignInNum(courseScheduleId, "NORMAL");

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -307,14 +307,23 @@ public class RoomServiceImpl implements RoomService {
             roomResult.setSoundVolume(room.getSoundVolume());
         }
         //是否使用自定义白板
-        if(courseSchedule.getOrganId().equals(1) && (courseSchedule.getStudentNum() == null || courseSchedule.getStudentNum() == 1)){
+        String rongyun_here_white_flag = sysConfigDao.findConfigValue("rongyun_here_white_flag");
+        if(StringUtils.isNotEmpty(rongyun_here_white_flag)){
+            HashMap<Integer,Integer> hashMap = JSONObject.parseObject(rongyun_here_white_flag, HashMap.class);
+            Integer s = hashMap.get(courseSchedule.getOrganId());
+            if(s == null){
+                roomResult.setRandomNumeric("0");
+            }else {
+                roomResult.setRandomNumeric(s.toString());
+            }
+        }else {
             roomResult.setRandomNumeric("1");
         }
-//        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
         log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
         return new BaseResponse(roomResult);
     }
 
+
     public RoomMember saveRoomMember(String roomId, String userId) {
         SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));