From 444c425ea62040284edf315101c1df7c915899cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 10:57:35 +0800
Subject: [PATCH] 数据异议改造
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java
index be2a3ac..b2a6e71 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java
@@ -37,6 +37,7 @@
import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandAuditAttachmentWrapper;
import org.sxkj.system.cache.SysCache;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -54,7 +55,10 @@
@Override
public IPage<GdDataObjectionVO> selectGdDataObjectionPage(IPage<GdDataObjectionVO> page, GdDataObjectionPageParam gdDataObjection) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdDataObjection.setDeptList(deptList);
return page.setRecords(baseMapper.selectGdDataObjectionPage(page, gdDataObjection));
}
@@ -72,7 +76,8 @@
@Override
public boolean saveOrUpdateDataObjection(GdDataObjectionDTO gdDataEvaluationDTO) {
GdDataObjectionEntity gdDataObjectionEntity = GdDataObjectionWrapper.build().entityDTO(gdDataEvaluationDTO);
- if(gdDataObjectionEntity.getObjectionStatus().equals("2")){
+ // Set handleUnit if not already set
+ if(gdDataObjectionEntity.getHandleUnit() == null || gdDataObjectionEntity.getHandleUnit().isEmpty()) {
String deptName = SysCache.getDeptName(Long.valueOf(AuthUtil.getDeptId()));
gdDataObjectionEntity.setHandleUnit(deptName);
}
--
Gitblit v1.9.3