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

# Conflicts:
#	mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -143,4 +143,12 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param content
 	 */
     void sendPrivateMessage(String studentId, String content);
+
+	/**
+	 * 发送私聊消息
+	 * @param sender
+	 * @param receiver
+	 * @param content
+	 */
+	void sendPrivateMessage(String sender,String receiver, String content);
 }

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

@@ -418,7 +418,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                         "联系人：" + repairInfo.getEmployeePhone() + "（" + repairInfo.getEmployeePhone() + "）\n\r" +
                         "地址：" + repairInfo.getEmployeeAddress() + "";
             }
-            sysMessageService.sendPrivateMessage(userId.toString(), imContent);
+            sysMessageService.sendPrivateMessage(repairInfo.getEmployeeId().toString(),userId.toString(), imContent);
             return true;
         }
 

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

@@ -218,6 +218,17 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
+	public void sendPrivateMessage(String sender, String receiver, String content) {
+		ImPrivateMessage privateMessage = new ImPrivateMessage();
+		privateMessage.setObjectName("RC:TxtMsg");
+		privateMessage.setTargetId(receiver.split(","));
+		privateMessage.setSenderId(sender);
+		privateMessage.setIsIncludeSender(1);
+		privateMessage.setContent(new ImTxtMessage(content,null));
+		imFeignService.privateSend(privateMessage);
+	}
+
+	@Override
 	@Async
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
 			Integer readStatus, String memo, String group,String jpushType) {