更改沟通状态发送消息通知BUG解决

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -128,10 +128,11 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 				if(company!=null){
 					companyName = company.getName();
-				}
+					if(StringUtils.isEmpty(model.getCompanyPhone())){
+						model.setCompanyPhone(company.getTel());
+					}
 
-				position = resumeDeliverContent.getEntryPost();
-				positionDep = resumeDeliverContent.getEntryDepartment();
+				}
 				workAddress = recruitment.getAddress();
 			}
 			if(resume!=null){
@@ -140,6 +141,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				if(jobUser!=null){
 					jobUserName = jobUser.getRealName();
 					idCard = jobUser.getIdCard();
+					model.setJobUserId(jobUser.getId());
 				}
 			}
 
@@ -153,6 +155,10 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
 
+				if(StringUtils.isEmpty(model.getJobUserId())){
+					model.setJobUserId(resumeDeliver.getJobUserId());
+				}
+
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 			}
@@ -162,13 +168,17 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
 
+
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 
 			}
 			else if(chatType.equals("4")){
-				resumeDeliverContent.setEntryPost(model.getEntryPosition());
-				resumeDeliverContent.setEntryDepartment(model.getEntryDepartment());
+				position = model.getEntryPosition();
+				positionDep = model.getEntryDepartment();
+				resumeDeliverContent.setEntryPost(position);
+				resumeDeliverContent.setEntryDepartment(positionDep);
+				tel = model.getCompanyPhone();
 
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeDeliverController.java

@@ -176,7 +176,6 @@ public class ResumeDeliverController {
 
                     resumeDeliverRecord.setRemark("录用人：" + jobUser.getRealName() + "，身份证号：" + jobUser.getIdCard() + "，入职公司：" + company.getName() + "，入职岗位：" + entryPosition + "，入职部门：" + entryDepartment + "，工作地点：" + recruitment.getArea());
 
-
                     resumeDeliverRecord.setEntryPosition(entryPosition);
                     resumeDeliverRecord.setEntryDepartment(entryDepartment);
                     resumeDeliverRecord.setJobUserId(jobUser.getId());