From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
index fba319b..6afc2aa 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.DictConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -97,7 +98,12 @@
 		if (aLong > 0) {
 			taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
 			taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
-			taskLabelReportingEvent.setConfirmTime(new Date());
+			if (null!=taskLabelReportingEvent.getStatus()
+				&& taskLabelReportingEvent.getStatus()!=4) {
+				taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
+				taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+				taskLabelReportingEvent.setConfirmTime(new Date());
+			}
 			Boolean b = baseMapper.updateById(taskLabelReportingEvent) > 0;
 			if (b) {
 				return b;

--
Gitblit v1.9.3