From 834d9ee44347c69d04a25e3bff5ca1f8a102a517 Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Sat, 12 Nov 2022 18:34:24 +0800
Subject: [PATCH] =?UTF-8?q?[FrontedWebApi][=E9=81=8B=E7=B6=AD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=20=E6=96=B0=E5=A2=9E=E7=B6=AD=E4=BF=AE=E5=96=AEmodel?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontendWebApi/ApiControllers/OperationController.cs | 4 ++--
 FrontendWebApi/Models/Operation.cs                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FrontendWebApi/ApiControllers/OperationController.cs b/FrontendWebApi/ApiControllers/OperationController.cs
index c4aadeb..db61951 100644
--- a/FrontendWebApi/ApiControllers/OperationController.cs
+++ b/FrontendWebApi/ApiControllers/OperationController.cs
@@ -200,8 +200,8 @@ namespace FrontendWebApi.ApiControllers
 
             try
             {
-                var sqlString = @$"select device_number, concat(device_floor_tag, ' ', device_last_name, ' ', device_serial_tag) as device_name
-                                   from device where deleted = 0 and device_area_tag = @device_area_tag and device_building_tag = @device_building_tag and device_floor_tag = @device_floor_tag and d.device_system_tag = @main_system_tag and d.device_name_tag = @sub_system_tag ";
+                var sqlString = @$"select device_number, concat(device_floor_tag, ' ', device_last_name, ' ', device_serial_tag) as device_name, full_name
+                                   from device where deleted = 0 and device_area_tag = @device_area_tag and device_building_tag = @device_building_tag and device_floor_tag = @device_floor_tag and device_system_tag = @main_system_tag and device_name_tag = @sub_system_tag ";
 
                 var param = new { @device_building_tag = bl.device_building_tag, @device_floor_tag = bl.device_floor_tag, @device_area_tag = bl.device_area_tag, @main_system_tag = bl.main_system_tag, @sub_system_tag = bl.sub_system_tag };
 
diff --git a/FrontendWebApi/Models/Operation.cs b/FrontendWebApi/Models/Operation.cs
index 5a08c56..e7e6fc2 100644
--- a/FrontendWebApi/Models/Operation.cs
+++ b/FrontendWebApi/Models/Operation.cs
@@ -63,7 +63,7 @@ namespace FrontendWebApi.Models
     public class Operation_Record : Actor
     {
         public int id { get; set; }
-        public byte deleted { get; set; }
+        public byte? deleted { get; set; }
         public string formId { get; set; }
         public string location { get; set; }
         public string location_code { get; set; }
@@ -75,7 +75,7 @@ namespace FrontendWebApi.Models
         public string fix_do_code { get; set; }
         public int fix_firm { get; set; }
         public byte status { get; set; }
-        public int work_person_id { get; set; }
+        public string work_person_id { get; set; }
         public DateTime start_time { get; set; }
         public DateTime end_time { get; set; }
         public DateTime work_time { get; set; }