From 8754350da1af538787b239530b950a15a351ab8a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jun 2026 15:20:45 +0800
Subject: [PATCH] fix(auth): 修复权限判断逻辑错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 6571a85..623a1dc 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -51,6 +51,7 @@
import org.sxkj.gd.workorder.mapper.GdWorkOrderMapper;
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
+import org.sxkj.gd.workorder.param.GdPatrolTaskPendingAcceptanceQueryParam;
import org.sxkj.gd.workorder.service.IGdManageDeviceService;
import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.sxkj.gd.workorder.service.IGdTaskResultService;
@@ -102,7 +103,7 @@
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
List<Long> deptList = new ArrayList<>();
- if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
deptList = SysCache.getDeptChildIds(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
}
gdPatrolTask.setDeptList(deptList);
@@ -793,6 +794,26 @@
}
/**
+ * 查询待验收状态的巡查任务列表（对外接口）
+ *
+ * @param queryParam 查询参数，包含任务名称和时间区间
+ * @return 待验收状态的巡查任务列表
+ */
+ @Override
+ public List<GdPatrolTaskVO> selectPendingAcceptanceTasks(GdPatrolTaskPendingAcceptanceQueryParam queryParam) {
+ // 1. 参数校验：防止空指针
+ if (queryParam == null) {
+ queryParam = new GdPatrolTaskPendingAcceptanceQueryParam();
+ }
+
+ // 2. 调用Mapper查询待验收状态的巡查任务
+ List<GdPatrolTaskVO> pendingAcceptanceTasks = baseMapper.selectPendingAcceptanceTasks(queryParam);
+
+ // 3. 返回查询结果
+ return pendingAcceptanceTasks;
+ }
+
+ /**
* 将区域编码转换为多级行政区划编码格式
*
* @param areaCode 区域编码（如：360802）
--
Gitblit v1.9.3