ソースを参照

bug

Signed-off-by: liuyc <56808083@qq.com>
liuyc 1 年間 前
コミット
fa94c4dece

+ 4 - 4
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1666,12 +1666,12 @@ public class TaskController extends BladeController {
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "附件文件上传", notes = "传入TaskDataUploadFileDTO")
     public R<Object> dataUploadFile(@RequestBody TaskDataUploadFileDTO dto) {
-        if (ObjectUtil.isEmpty(dto.getTaskId())) {
-            throw new ServiceException("未获取到taskId");
+        if (ObjectUtil.isEmpty(dto.getTaskId()) || ObjectUtil.isEmpty(dto.getDataId())) {
+            throw new ServiceException("未获取到taskId或dataId");
         }
         Task task = jdbcTemplate.query("SELECT meter_task_type,process_instance_id,contract_id,project_id,status FROM u_task WHERE id = " + dto.getTaskId(), new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if (task != null) {
-            if (task.getStatus().equals(2)) {
+            if (Arrays.asList(2, 3).contains(task.getStatus())) {
                 throw new ServiceException("当前任务已完成审批,无法上传");
             }
             check(task);
@@ -1701,7 +1701,7 @@ public class TaskController extends BladeController {
         }
         Task task = jdbcTemplate.query("SELECT meter_task_type,process_instance_id,status FROM u_task WHERE id = " + taskId, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if (task != null) {
-            if (task.getStatus().equals(2)) {
+            if (Arrays.asList(2, 3).contains(task.getStatus())) {
                 throw new ServiceException("当前任务已完成审批,无法删除");
             }
             check(task);