From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index f352139..2e5ee7d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -83,7 +83,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁捐椤圭洰")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<MesPdProjectRespVO> getProject(@RequestParam("id") Long id) {
MesPdProjectDO project = projectService.getProject(id);
if (project == null) {
@@ -94,7 +93,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁捐椤圭洰鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<PageResult<MesPdProjectRespVO>> getProjectPage(@Valid MesPdProjectPageReqVO pageReqVO) {
PageResult<MesPdProjectDO> pageResult = projectService.getProjectPage(pageReqVO);
return success(new PageResult<>(buildProjectRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -125,7 +123,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -179,7 +177,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱璁捐椤圭洰鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(projectService.getProjectApproverUserIds());
}
--
Gitblit v1.9.3