update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/http/HttpHelper.java

@@ -244,7 +244,7 @@ public class HttpHelper {
         return data;
     }
 
-    public String returnResult(HttpURLConnection conn, String body) throws Exception, IOException {
+    public String returnResult(HttpURLConnection conn, String body) throws Exception{
         InputStream input = null;
         if (conn.getResponseCode() == 200) {
             input = conn.getInputStream();

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -518,11 +518,11 @@ public class IMHelper {
         }
 
         StringBuilder sb = new StringBuilder();
-        sb.append("&fromUserId=").append(URLEncoder.encode(fromUserId.toString(), UTF8));
+        sb.append("&fromUserId=").append(URLEncoder.encode(fromUserId, UTF8));
 
         //定向消息
         if (toUserId != null) {
-            sb.append("&toUserId=").append(URLEncoder.encode(toUserId.toString(), UTF8));
+            sb.append("&toUserId=").append(URLEncoder.encode(toUserId, UTF8));
         }
 
         for (int i = 0; i < toGroupId.length; i++) {

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -812,11 +812,12 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			examRoom.setExamFlag(openFlag);
 		}
 		examRoomDao.update(examRoom);
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
+//		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		String userId = examRoom.getMainTeacherUserId().toString();
 		PublishMessageDto publishMessageDto = new PublishMessageDto();
-		publishMessageDto.setUserId(sysUser.getId().toString());
+		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomId.toString());
-		MemberChangedMessage msg = new MemberChangedMessage(5, sysUser.getId().toString(),3);
+		MemberChangedMessage msg = new MemberChangedMessage(5, userId,3);
 		msg.setAppParamJson(examCertificationService.basicNeedCheckingDetail(examRoomId));
 		publishMessageDto.setMemberChangedMessage(msg);
 		//加群退群
@@ -867,10 +868,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			if(i == 0){
 				throw new BizException("操作失败：还有老师没完成评审");
 			}
-			imFeignService.publishMessage(publishMessageDto);
-//			imFeignService.dismissGroup(sysUser.getId().toString(),examRoomId.toString());
 			studentExamResultService.calculateStudentExamAvgScore(examRoomId);
-			imFeignService.destroyRoom(examRoomId,sysUser.getId().toString());
+			imFeignService.publishMessage(publishMessageDto);
+			imFeignService.destroyRoom(examRoomId,userId);
 		}
 	}
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamSongServiceImpl.java

@@ -22,6 +22,7 @@ import com.keao.edu.util.collection.MapUtil;
 import com.keao.edu.util.excel.POIUtil;
 import com.keao.edu.util.iniFile.IniFileEntity;
 import com.keao.edu.util.iniFile.IniFileUtil;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,7 +178,6 @@ public class ExamSongServiceImpl extends BaseServiceImpl<Integer, ExamSong> impl
                                 objectMap.put("fileUrlList", pics.substring(1));
                             }
                         }
-
                         if (column.getValue().equals("type")) {
                             for (SongTypeEnum songType : SongTypeEnum.values()) {
                                 if (songType.getMsg().equals(row.get(s).toString())) {

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -69,7 +69,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
     public void add(Organization organ) {
         //获取当前用的organ
         SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
-        Organization currentOrganization = organDao.findByUserId(queryUserInfo.getId());
+        Employee employee1 = employeeDao.get(queryUserInfo.getId());
+        Organization currentOrganization = organDao.get(employee1.getOrganId());
+//        Organization currentOrganization = organDao.findByUserId(queryUserInfo.getId());
         if (Objects.isNull(currentOrganization)) {
             throw new BizException("用户信息错误");
         }