Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java

@@ -24,6 +24,14 @@ public class ArchiveTask {
 	@Autowired
 	private DaprArchivesProperties daprArchivesProperties;
 
+
+	public void updateEmployeeAgeTask() {
+		log.info("-------------每年1月1号刷新在职和离职人员的年龄信息-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
+				"/temployeeinfo/inner/updateEmployeeAgeTask", "", Object.class,
+				SecurityConstants.FROM_IN);
+		log.info("-------------每年1月1号刷新在职和离职人员的年龄信息-定时任务结束------------");
+	}
 	/**
 	 * @Author hgw
 	 * @Description 每月1号清理人员档案、项目档案的薪资状态

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2582,7 +2582,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (empVo.getHignEducation().equals("7")) {
 				excel.setEducationName("硕士");
 			}
-			if (excel.getEducationName().equals("8")) {
+			if (empVo.getHignEducation().equals("8")) {
 				excel.setEducationName("博士");
 			}
 			if (empVo.getHignEducation().equals("9")) {