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-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java
index 13fefc7..97ea791 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java
@@ -116,9 +116,11 @@
@Override
public IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachPageParam attach) {
// 创建部门
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- attach.setDeptList(deptList);
- List<AttachVO> attachVOS = baseMapper.selectAttachPage(page, attach);
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ attach.setDeptList(deptList);
+ }
+ List<AttachVO> attachVOS = baseMapper.selectAttachPage(page, attach);
return page.setRecords(attachVOS);
}
@@ -783,7 +785,8 @@
/**
* 下载附件
- * @param param 下载参数
+ *
+ * @param param 下载参数
* @param outputStream 输出流
* @return
* @throws IOException
@@ -878,7 +881,7 @@
} catch (Exception e) {
log.error("创建zip文件失败", e);
return false;
- }finally {
+ } finally {
if (outputStream != null) {
try {
outputStream.flush();
--
Gitblit v1.9.3