Merge branch 'refs/heads/master' into 分包商

ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java

@@ -338,10 +338,11 @@ public class BusinessTask
 			LocalDate startTime = wgzLeave.getStartTime().toLocalDate();
 			// startTime大于等于now，那么就修改状态为请假超时
 			if (startTime.isEqual(now) || startTime.isAfter(now)){
-				WgzLeave st = new WgzLeave()
-					.setId(wgzLeave.getId())
-					.setAuditorType("5");
-				updataList.add(st);
+//				WgzLeave st = new WgzLeave()
+//					.setId(wgzLeave.getId())
+//					.setAuditorType("5");
+				wgzLeave.setAuditorType("5");
+				updataList.add(wgzLeave);
 				//组装请假超时的消息
 				WgzMessage wgzMessage = new WgzMessage().
 					setSenderType(USERTYPE_SYSTEM).
@@ -351,6 +352,7 @@ public class BusinessTask
 					setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"118")).
 					setMessageLargeType(LARGE_OTHER).
 					setMessageSmallType(SMALL_SYSTEM);
+				wgzMessage.setUpdateBy("系统").setCreateBy("系统");
 				messagesList.add(wgzMessage);
 				//状态超时需要把对应消息的状态变更为【不需要操作】
 				BgtProjectRecruit recruit = iBgtProjectRecruitService.getById(wgzLeave.getRecruitId());