From 523365960513f297024a419f94b2b42eccd9456f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 11:21:41 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 1180e8e..4f6daa8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -15,7 +15,9 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -47,6 +49,7 @@
QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
Page<Task> pageResult = taskService.page(pageParam, queryWrapper);
taskService.fillCanComplete(pageResult.getRecords());
+ buildPageRowsUtils.userNameMap(pageResult.getRecords());
return R.ok().add(pageResult);
}
@@ -89,6 +92,7 @@
@OperationLog("Update 浠诲姟宸ヤ綔妗�")
@PostMapping("/task/update")
public R update(@RequestBody Task task) {
+ OptimisticLockUtils.requireVersion("浠诲姟", task.getVersion());
task.setUpdateBy(getLoginUserId());
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
--
Gitblit v1.9.1