diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs
index 2ad71ff6..b1999d8d 100644
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@@ -511,7 +511,7 @@ namespace AMESCoreStudio.Web.Controllers
             //判斷組件是否更換
             for (int i = 0; i < ng_component.Count; i++)
             {
-                if (ng_component[i].NewPartNo != "")
+                if (ng_component[i].NewPartNo != "" && ng_component[i].NewPartNo != null)
                 {
                     items.Add(new BarCodeCheckDto.inputItem
                     {
@@ -522,6 +522,11 @@ namespace AMESCoreStudio.Web.Controllers
                 }
             }
 
+            if (items.Count == 0)
+            {
+                items = null;
+            }
+
             if (repairComplete)
             {
                 //判断全部维修完成过站
diff --git a/AMESCoreStudio.Web/Views/REP/REP001V.cshtml b/AMESCoreStudio.Web/Views/REP/REP001V.cshtml
index bbccf672..bb5ec274 100644
--- a/AMESCoreStudio.Web/Views/REP/REP001V.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001V.cshtml
@@ -134,13 +134,19 @@
                 templet: '<div>{{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}</div>'
             },
             {
-                field: 'right',
+                field: 'status',
                 width: 120,
                 title: '操作',
                 align: 'center',
                 fixed: 'right',
                 templet: function (d) {
-                    return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="repair"> 維修 </a>'
+                    if (d.status == 0) {
+                        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="repair"> 維修 </a>'
+                    }
+                    else
+                    {
+                        return "";
+                    }
                 }
             }]
         ];