From e702269b1154c68aa357a3c63e2ed9b1d568b64c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 14:25:32 +0800
Subject: [PATCH] 文件下发,放入OSS备查
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..d56fb2b 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));
}
--
Gitblit v1.9.3