From 846ea56bfd4d5627d997b00054971ca32ad96129 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 09:07:22 +0800
Subject: [PATCH] refactor(workorder): 修改工单详情查询方法返回类型
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index ea89dd5..fe384d5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -32,6 +32,7 @@
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -50,14 +51,17 @@
private IGdPatrolTaskService gdPatrolTaskService;
@Override
- public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
+ public GdWorkOrderVO getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
return baseMapper.getWorkOrderDetail(gdWorkOrder);
}
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
if (gdWorkOrder.getIsQueryAll()) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdWorkOrder.setDeptList(deptList);
}
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
@@ -73,12 +77,6 @@
return gdWorkOrderList;
}
- /**
- * 保存工单任务表
- *
- * @param workOrderParam
- * @return
- */
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
--
Gitblit v1.9.3