From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +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, 8 insertions(+), 1 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 b5ee84c..2ddf55c 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
@@ -27,6 +27,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.common.IdParam;
import org.sxkj.gd.implement.entity.GdImplementListEntity;
@@ -59,8 +60,12 @@
@Override
public IPage<GdImplementListVO> selectGdImplementListPage(IPage<GdImplementListVO> page, GdImplementListPageParam gdImplementList) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdImplementList.setDeptList(deptList);
+ gdImplementList.setAreaCode(HeaderUtils.formatAreaCode(gdImplementList.getAreaCode()));
return page.setRecords(baseMapper.selectGdImplementListPage(page, gdImplementList));
}
@@ -71,6 +76,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()
--
Gitblit v1.9.3