From 4b397a21eb979617f4fe9ff9fc1edb7a1be72900 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:45:29 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
index 3bbe281..6ae29e6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
@@ -19,7 +19,6 @@
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.NcProgramExportDNCService;
-import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
import org.springframework.web.bind.annotation.*;
@@ -49,13 +48,14 @@
public R<IPage<NcProgramExportDncPageVO>> page(NcProgramExportDncQueryVO query) {
String userRole = AuthUtil.getUserRole();//瑙掕壊鍒悕锛屽涓鑹查�楀彿鍒嗛殧
List<String> userRoleAliasList = Func.toStrList(",", userRole);
-
+ /*
String managerRole = paramService.getProgramManagerRoleAlias();
if(!userRoleAliasList.contains(managerRole) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
//闈炴暟鎺х鐞嗗憳瑙掕壊銆佺鐞嗗憳锛岄檺鍒舵湭鍙兘瀵煎嚭鑷繁鐨勭▼搴�
query.setUserId(AuthUtil.getUserId());
- }
-
+ }*/
+ query.setUserId(AuthUtil.getUserId());
+ query.setUserDeptIds(Func.toLongList(AuthUtil.getDeptId()));
return R.data(ncProgramApprovedService.exportDncPageQuery(query));
}
@@ -69,7 +69,6 @@
//瀵煎嚭鏂囦欢鍚嶇О瑕佹眰瀵煎嚭浜哄悕瀛�+鏃堕棿鎴�
String uname = UrlUtil.encode(AuthUtil.getNickName());
- //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
String filename = uname+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
response.setHeader("Content-Disposition", "attachment; filename="+filename);
response.setContentType("application/octet-stream;charset=utf-8");
--
Gitblit v1.9.3