From a3c4c83e9194efebafe730ef47e121f88d36dd54 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 16:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
index b1faf2d..026a7e9 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
@@ -71,6 +71,8 @@
// 查询实施清单详情
GdImplementListEntity gdImplement = getOne(Condition.getQueryWrapper(GenericConverter.convert(idParam, GdImplementListEntity.class)));
getThingListMaterialRelationVO.setImplementListId(gdImplement.getId());
+ getThingListMaterialRelationVO.setProcessDefinitionId(gdImplement.getProcessDefinitionId());
+ getThingListMaterialRelationVO.setProcessInstanceId(gdImplement.getProcessInstanceId());
List<GdThingListMaterialRelEntity> gdThingListMaterialRelEntityList = gdThingListMaterialRelService.list(
Wrappers.<GdThingListMaterialRelEntity>query()
@@ -87,14 +89,9 @@
if (null != param.getImplementListId()) {
// 关联关系先删除，在新增
- boolean implementListId = gdThingListMaterialRelService.remove(
+ gdThingListMaterialRelService.remove(
new QueryWrapper<GdThingListMaterialRelEntity>()
.eq("implement_list_id", param.getImplementListId()));
-
- // 删除失败，返回false
- if (!implementListId) {
- return false;
- }
List<GdThingListMaterialRelEntity> gdThingListMaterialRelEntityList = getGdThingListMaterialRelEntities(param);
--
Gitblit v1.9.3