From ed4733bbde1f6e66671d98ec3255522c8221a4e1 Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Fri, 18 Jun 2021 11:54:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=20bug=20fix=202.=20=E5=9C=9F=E5=9C=B0?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8D=A1=E7=89=87=EF=BC=8C=E8=B3=87=E6=96=99?=
 =?UTF-8?q?=E9=87=8D=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Controllers/PowerStationController.cs     |  1 -
 .../Views/PowerStation/PowerStationEdit.cshtml       | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SolarPower/Controllers/PowerStationController.cs b/SolarPower/Controllers/PowerStationController.cs
index 01780dc..6a75b6b 100644
--- a/SolarPower/Controllers/PowerStationController.cs
+++ b/SolarPower/Controllers/PowerStationController.cs
@@ -304,7 +304,6 @@ namespace SolarPower.Controllers
                     {
                         "Address",
                         "PowerStationId",
-                        "CreatedBy",
                         "CreatedBy"
                     };
                     await powerStationRepository.AddOneLandBuildingInfo(landBuilding, landBuildingProperties);
diff --git a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml
index a5ea878..52d63f9 100644
--- a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml
+++ b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml
@@ -1028,6 +1028,16 @@
 
         //#region 創建每份土地房屋資訊卡片
         function CreateLandBuildingCard(dom, value) {
+
+            //資料重整
+            value.address = value.address ? value.address : '';
+            value.coordinate = value.coordinate ? value.coordinate : '';
+            value.leaseNotarizationAt = value.leaseNotarizationAt ? value.leaseNotarizationAt : '';
+            value.leaseRate = value.leaseRate ? value.leaseRate : 0;
+            value.landowner = value.landowner ? value.landowner : '';
+            value.phone = value.phone ? value.phone : '';
+            value.purpose = value.purpose ? value.purpose : '';
+
             var appendStr = "";
             appendStr += '<div class="card border mb-g w-100" data-land-building-id="' + value.id + '">' +
                 '<div class="card-header bg-fusion-50 pr-3 d-flex align-items-center flex-wrap justify-content-between">' +
@@ -1078,7 +1088,7 @@
                 '<label class="col-xl-4 form-label">租金比例 (%)</label>' +
                 '<div class="col-xl-8">' +
                 '<label id="land_building_lease_Rate_text_' + value.id + '" class="color-info-600">' + value.leaseRate + '</label>' +
-                '<input type="text" style="display:none" id="land_building_lease_Rate_' + value.id + '" name="land_building_lease_Rate_' + value.id + '" class="form-control" value="' + value.leaseRate + '">' +
+                '<input type="number" style="display:none" id="land_building_lease_Rate_' + value.id + '" name="land_building_lease_Rate_' + value.id + '" class="form-control" value="' + value.leaseRate + '">' +
                 '</div>' +
                 '</div>' +
                 '</div>' +