diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
index cbafde3..cbcef12 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
@@ -96,4 +96,16 @@ public class DmsBaseShutReasonController extends BaseController
     {
         return toAjax(dmsBaseShutReasonService.deleteDmsBaseShutReasonByShutReasonIds(shutReasonIds));
     }
+
+    /**
+     * 不分页查询所有停机原因信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('dms:shutReason:list')" )
+    @GetMapping("/selectDmsBaseShutReasonList")
+    public AjaxResult selectDmsBaseShutReasonList(DmsBaseShutReason dmsBaseShutReason)
+    {
+        List<DmsBaseShutReason> list = dmsBaseShutReasonService.selectDmsBaseShutReasonList(dmsBaseShutReason);
+        return AjaxResult.success(list);
+    }
+    
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
index 0b6a133..b9df03d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
@@ -19,8 +19,8 @@ import java.util.List;
  * @date 2024-01-15
  */
 @Service
-public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
-{
+public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService{
+
     @Autowired
     private DmsRecordShutDownMapper dmsRecordShutDownMapper;
 
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
index c74dc37..764c0e0 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
@@ -30,7 +30,7 @@
                r.machine_id as device_id,
                r.shut_type_id as shut_type,
                r.shut_reason_id,
-               r.shut_reason,
+               nvl(s.shut_reason, r.shut_reason) as shut_reason,
                r.shut_begin_time,
                r.shut_end_time,
                r.shut_time,
@@ -45,6 +45,7 @@
                d.device_name as device_name
         from dms_record_shut_down r
         left join base_deviceledger d on r.machine_id = d.OBJ_ID
+        left join dms_base_shut_reason s on r.shut_reason_id = s.shut_reason_id
     </sql>
 
     <select id="selectDmsRecordShutDownList" parameterType="DmsRecordShutDown" resultMap="DmsRecordShutDownResult">