From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index 0b08b15..9547d84 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -50,7 +50,7 @@
      * 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
      */
     @Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ")
-//    @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
+    @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
     @GetMapping("/list")
     public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) {
 //        startPage();
@@ -66,8 +66,8 @@
                 apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
                 apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
                 apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
-                        .filter(shop -> Objects.equals(shop.getShopName(), apsStandardProcessTemp.getWorkShop()))
-                        .map(ApsShop::getShopCode)
+                        .filter(shop -> Objects.equals(shop.getShopCode(), apsStandardProcessTemp.getWorkShop()))
+                        .map(ApsShop::getShopName)
                         .findFirst()
                         .orElse(null));
                 list.add(apsGasPipelineCapacityPlanTemp);
@@ -105,8 +105,8 @@
                 apsGasPipelineCapacityPlanTemp.setProcessName(process.getProcessName());
                 apsGasPipelineCapacityPlanTemp.setOrgCode(process.getPlant());
                 apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
-                        .filter(shop -> Objects.equals(shop.getShopName(), process.getWorkShop()))
-                        .map(ApsShop::getShopCode)
+                        .filter(shop -> Objects.equals(shop.getShopCode(), process.getWorkShop()))
+                        .map(ApsShop::getShopName)
                         .findFirst()
                         .orElse(null));
                 list.add(apsGasPipelineCapacityPlanTemp);
@@ -134,7 +134,7 @@
      * 澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝
      */
     @Operation(summary = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", description = "澶嶅埗")
-//    @RequiresPermissions("aps:gasPipelineCapacityPlan:copy")
+    @RequiresPermissions("aps:gasPipelineCapacityPlan:copy")
     @Log(title = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.INSERT)
     @PutMapping("/copy")
     public AjaxResult copy(

--
Gitblit v1.9.3