From 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 20:37:45 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
index 43fbd7e..3f28629 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
@@ -17,9 +17,10 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskRepairStepDTO;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
@@ -73,10 +74,13 @@
public Boolean saveTaskRepairStep(TaskRepairStepVO task) {
task.setUserId(AuthUtil.getUserId());
TaskReportForRepairsEntity taskReportForRepairsEntity = new TaskReportForRepairsEntity();
- taskReportForRepairsEntity.setTaskId(task.getRepairId());
+ taskReportForRepairsEntity.setId(task.getRepairId());
taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
- boolean update = SpringUtils.getBean(ITaskReportForRepairsService.class).save(taskReportForRepairsEntity);
- return update ? save(task) : false;
+ if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag())|| CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
+ task.setName(AuthUtil.getUserName());
+ }
+ SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
+ return save(task);
}
}
--
Gitblit v1.9.3