From 44921e73793cf861f476430204d5ece4bfd8edb9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 15 Jan 2024 16:30:56 +0800
Subject: [PATCH] 校园,旅馆,二手车、二手手机、打金店修改

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

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
index 65cb5c9..a45865f 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.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.secure.utils.AuthUtil;
 import org.springblade.modules.place.entity.PlaceEntity;
@@ -81,9 +82,12 @@
 	public Boolean updateHotelReporting(TaskHotelReportingVO taskHotelReporting) throws Exception {
 		Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskHotelReporting.getTaskId(), taskHotelReporting.getStatus());
 		if (aLong > 0) {
-			taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
-			taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
-			taskHotelReporting.setConfirmTime(new Date());
+			if (null!=taskHotelReporting.getStatus()
+				&& taskHotelReporting.getStatus()!=4) {
+				taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
+				taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
+				taskHotelReporting.setConfirmTime(new Date());
+			}
 			boolean b = baseMapper.updateById(taskHotelReporting) > 0;
 			if (b) {
 				return b;

--
Gitblit v1.9.3