From 0bdfd76339bb58be09927b8c2fe268175c3a7cc8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 10:11:33 +0800
Subject: [PATCH] 优化现场编制导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 55ff76a..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
@@ -13,17 +13,19 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.UrlUtil;
+import org.springblade.mdm.commons.service.ParamService;
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.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.util.List;
/**
* 绋嬪簭娑夊瘑缃�-宸ユ帶缃戜氦鎹㈡帴鍙�
@@ -38,12 +40,22 @@
@Slf4j
public class NcProgramExportDNCController {
- private final NcProgramService ncProgramService;
+ private final ParamService paramService;
private final NcProgramApprovedService ncProgramApprovedService;
private final NcProgramExportDNCService ncProgramExportDNCService;
@Operation(summary = "绋嬪簭瀵煎嚭DNC鍒嗛〉鏌ヨ", description = "鍒嗛〉鏌ヨ锛屼緵鐢ㄦ埛閫夋嫨鏁版嵁")
@GetMapping("/export-dnc-page")
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