From dab98d2c0f573d8e17a7786a879e595e6d535a9a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 19:45:36 +0800
Subject: [PATCH] 工单-机构权限控制

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 f9dc808..2fe0790 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
@@ -16,10 +16,12 @@
  */
 package org.sxkj.gd.orderdata.service.impl;
 
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.sxkj.gd.orderdata.dto.GdDataObjectionDTO;
 import org.sxkj.gd.orderdata.entity.GdDataObjectionAttachmentEntity;
 import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
+import org.sxkj.gd.orderdata.param.GdDataObjectionDetailParam;
 import org.sxkj.gd.orderdata.param.GdDataObjectionPageParam;
 import org.sxkj.gd.orderdata.service.IGdDataObjectionAttachmentService;
 import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
@@ -32,6 +34,7 @@
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.sxkj.gd.orderdata.wrapper.GdDataObjectionWrapper;
 import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandAuditAttachmentWrapper;
+import org.sxkj.system.cache.SysCache;
 
 import java.util.List;
 
@@ -49,6 +52,8 @@
 
 	@Override
 	public IPage<GdDataObjectionVO> selectGdDataObjectionPage(IPage<GdDataObjectionVO> page, GdDataObjectionPageParam gdDataObjection) {
+		List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+		gdDataObjection.setDeptList(deptList);
 		return page.setRecords(baseMapper.selectGdDataObjectionPage(page, gdDataObjection));
 	}
 
@@ -65,14 +70,30 @@
 	@Override
 	public boolean saveOrUpdateDataObjection(GdDataObjectionDTO gdDataEvaluationDTO) {
 		GdDataObjectionEntity gdDataObjectionEntity = GdDataObjectionWrapper.build().entityDTO(gdDataEvaluationDTO);
-		List<GdDataObjectionAttachmentEntity> gdDataObjectionAttachmentEntities = GdSupplyDemandAuditAttachmentWrapper.build().entityDTO(gdDataEvaluationDTO.getAttachmentList());
+		if(gdDataObjectionEntity.getObjectionStatus().equals("2")){
+			String deptName = SysCache.getDeptName(Long.valueOf(AuthUtil.getDeptId()));
+			gdDataObjectionEntity.setHandleUnit(deptName);
+		}
 		boolean result = saveOrUpdate(gdDataObjectionEntity);
 		if (result) {
-			gdDataObjectionAttachmentEntities.forEach(gdDataObjectionAttachmentEntity -> {
-				gdDataObjectionAttachmentEntity.setObjectionId(gdDataObjectionEntity.getId());
-			});
-			return gdDataObjectionAttachmentService.saveOrUpdateBatch(gdDataObjectionAttachmentEntities);
+			if (gdDataEvaluationDTO.getAttachmentList() != null) {
+				List<GdDataObjectionAttachmentEntity> gdDataObjectionAttachmentEntities = GdSupplyDemandAuditAttachmentWrapper.build().entityDTO(gdDataEvaluationDTO.getAttachmentList());
+				gdDataObjectionAttachmentEntities.forEach(gdDataObjectionAttachmentEntity -> {
+					gdDataObjectionAttachmentEntity.setObjectionId(gdDataObjectionEntity.getId());
+				});
+				return gdDataObjectionAttachmentService.saveOrUpdateBatch(gdDataObjectionAttachmentEntities);
+			}
+			return true;
 		}
 		return false;
 	}
+
+	/**
+	 * @param gdDataObjection
+	 * @return
+	 */
+	@Override
+	public GdDataObjectionVO getDetail(GdDataObjectionDetailParam gdDataObjection) {
+		return baseMapper.getDetail(gdDataObjection);
+	}
 }

--
Gitblit v1.9.3