From cf17fb5138ba67f1ef859496a7080eaaea418237 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 20 Jan 2024 15:27:14 +0800
Subject: [PATCH] 定时器调整

---
 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 9180929..d246a0d 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -160,7 +160,8 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入evaluateTask")
 	public R save(@Valid @RequestBody EvaluateTaskDTO dto) {
-		return R.status(evaluateTaskService.saveTaskAndCategory(dto));
+		evaluateTaskService.saveTaskAndCategory(dto);
+		return R.data(dto);
 	}
 
 	/**
@@ -180,7 +181,7 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
 	public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
-		if (DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+		if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
 			evaluateTask.setEvaluateState(1);
 		}
 		return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));

--
Gitblit v1.9.3