From dccf741494a83781a50654e6a7b67a0e48675ea6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 14:11:00 +0800
Subject: [PATCH] 工单权限优化

---
 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