diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
index f89197e..f04d0dc 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
@@ -64,18 +64,28 @@ public class RepairController extends BaseController {
             repairVO.setStatusName(repair.getStatus().getName());
             //设备类型
             RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId()));
-            repairVO.setTypeName(repairType.getName());
+            if (null != repairType){
+                repairVO.setTypeName(repairType.getName());
+            }
             //设备名称
             RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice()));
-            repairVO.setRepairDeviceName(repairDevice.getName());
+            if (repairDevice != null) {
+                repairVO.setRepairDeviceName(repairDevice.getName());
+            }
             //故障
             RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId());
-            repairVO.setFailureTypeName(repairFailureType.getName());
+            if (repairFailureType != null) {
+                repairVO.setFailureTypeName(repairFailureType.getName());
+            }
             IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId()));
-            repairVO.setUserName(staff.getUsername());
+            if (null != staff){
+                repairVO.setUserName(staff.getUsername());
+            }
 
             IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId());
-            repairVO.setWorkerName(worker.getUsername());
+            if (null != worker){
+                repairVO.setWorkerName(worker.getUsername());
+            }
 
             RepairRecord repairRecord = repairRecordService.selectByRepairId(id);
             if (null != repairRecord){
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java
index 72e4ae4..5fa3e6b 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java
@@ -79,7 +79,6 @@ public class RepairTypeController extends BaseController {
                 type.setWorkerNames(customerStaffs.get(0).getUsername()+"等"+customerStaffs.size()+"人");
                 type.setWorkerList(customerStaffs);
             }
-
         }
         return result(repairTypes);
     }