From 3000c5c5c4fee6028daf0091b827b9b4222b6a47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 15:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index 7b59cb6..437d97f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
@@ -236,7 +236,11 @@
locationService.updateById(location);
}
} else {
- location.setUnqualifiedTaskId(dto.getTaskId());
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId() + "," + dto.getTaskId());
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ }
locationService.updateById(location);
}
dto.setHandleType(3);
@@ -277,7 +281,11 @@
locationService.updateById(location);
}
} else {
- location.setUnqualifiedTaskId(dto.getTaskId());
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId() + "," + dto.getTaskId());
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ }
locationService.updateById(location);
}
}
--
Gitblit v1.7.1