From 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:13:10 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
index 1917cc6..b96a342 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
@@ -16,20 +16,19 @@
*/
package org.sxkj.gd.orderdata.service.impl;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
-import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
-import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
-import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
-import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
-import org.sxkj.gd.orderdata.service.IGdApplicationInnovationService;
-import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.stereotype.Service;
+import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
+import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
+import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
+import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
+import org.sxkj.gd.orderdata.service.IGdApplicationInnovationService;
+import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.system.cache.SysCache;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -44,10 +43,15 @@
@Override
public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
if (!AuthUtil.isAdministrator()) {
- if (gdApplicationInnovation.getIsQueryAll()) {
+ if (!gdApplicationInnovation.getIsQueryAll()) {
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
gdApplicationInnovation.setDeptList(deptList);
}
+ } else {
+ // 管理员角色下保留原有分页信息，仅清空查询条件
+ gdApplicationInnovation.setDeptList(null);
+ gdApplicationInnovation.setIsQueryAll(true);
+ gdApplicationInnovation.setInnovationStatus(null);
}
return page.setRecords(baseMapper.selectGdApplicationInnovationPage(page, gdApplicationInnovation));
}
--
Gitblit v1.9.3