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/orderdata/service/impl/GdApplicationInnovationServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 babb4d4..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,17 +16,17 @@
*/
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.List;
@@ -42,9 +42,16 @@
@Override
public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
- if(gdApplicationInnovation.getIsQueryAll()){
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- gdApplicationInnovation.setDeptList(deptList);
+ if (!AuthUtil.isAdministrator()) {
+ 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));
}
@@ -53,7 +60,7 @@
@Override
public List<GdApplicationInnovationExcel> exportGdApplicationInnovation(Wrapper<GdApplicationInnovationEntity> queryWrapper) {
List<GdApplicationInnovationExcel> gdApplicationInnovationList = baseMapper.exportGdApplicationInnovation(queryWrapper);
- //gdApplicationInnovationList.forEach(gdApplicationInnovation -> {
+ // gdApplicationInnovationList.forEach(gdApplicationInnovation -> {
// gdApplicationInnovation.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdApplicationInnovation.getType()));
//});
return gdApplicationInnovationList;
--
Gitblit v1.9.3