diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
index 8c5b022..b7e9906 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
@@ -81,7 +81,9 @@
             msa.approval_status,
             msa.apply_name,
             msa.apply_unit,
+            sd.SIMPLE_NAME AS apply_unit_name,
             msa.apply_person,
+            su.`NAME` AS apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -90,6 +92,8 @@
             msa.remark
         FROM
             equipment_apply msa
+            LEFT JOIN sys_user su ON msa.apply_person = su.id
+            LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id
         where msa.is_del = 0
         and msa.id = #{id}
     </select>

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
index 8c5b022..b7e9906 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
@@ -81,7 +81,9 @@
             msa.approval_status,
             msa.apply_name,
             msa.apply_unit,
+            sd.SIMPLE_NAME AS apply_unit_name,
             msa.apply_person,
+            su.`NAME` AS apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -90,6 +92,8 @@
             msa.remark
         FROM
             equipment_apply msa
+            LEFT JOIN sys_user su ON msa.apply_person = su.id
+            LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id
         where msa.is_del = 0
         and msa.id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 4e6bf53..996e289 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -12,6 +12,7 @@
             meae.id AS apply_equipment_id,
             mfa.id AS equipment_id,
             msa.apply_no,
+            msa.apply_name,
             msa.apply_type,
             mfa.equipment_no,
             mfa.equipment_name,

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
index 8c5b022..b7e9906 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
@@ -81,7 +81,9 @@
             msa.approval_status,
             msa.apply_name,
             msa.apply_unit,
+            sd.SIMPLE_NAME AS apply_unit_name,
             msa.apply_person,
+            su.`NAME` AS apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -90,6 +92,8 @@
             msa.remark
         FROM
             equipment_apply msa
+            LEFT JOIN sys_user su ON msa.apply_person = su.id
+            LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id
         where msa.is_del = 0
         and msa.id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 4e6bf53..996e289 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -12,6 +12,7 @@
             meae.id AS apply_equipment_id,
             mfa.id AS equipment_id,
             msa.apply_no,
+            msa.apply_name,
             msa.apply_type,
             mfa.equipment_no,
             mfa.equipment_name,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 557e1be..3726366 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -45,6 +45,13 @@
     private String applyNo;
 
     /**
+     * 申请名称
+     */
+    @TableField("apply_name")
+    @ApiModelProperty(value = "申请名称", dataType = "String")
+    private String applyName;
+
+    /**
      * 申请类型-字典code
      */
     @NotBlank(message = "申请类型不能为空")

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
index 8c5b022..b7e9906 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
@@ -81,7 +81,9 @@
             msa.approval_status,
             msa.apply_name,
             msa.apply_unit,
+            sd.SIMPLE_NAME AS apply_unit_name,
             msa.apply_person,
+            su.`NAME` AS apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -90,6 +92,8 @@
             msa.remark
         FROM
             equipment_apply msa
+            LEFT JOIN sys_user su ON msa.apply_person = su.id
+            LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id
         where msa.is_del = 0
         and msa.id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 4e6bf53..996e289 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -12,6 +12,7 @@
             meae.id AS apply_equipment_id,
             mfa.id AS equipment_id,
             msa.apply_no,
+            msa.apply_name,
             msa.apply_type,
             mfa.equipment_no,
             mfa.equipment_name,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 557e1be..3726366 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -45,6 +45,13 @@
     private String applyNo;
 
     /**
+     * 申请名称
+     */
+    @TableField("apply_name")
+    @ApiModelProperty(value = "申请名称", dataType = "String")
+    private String applyName;
+
+    /**
      * 申请类型-字典code
      */
     @NotBlank(message = "申请类型不能为空")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index d7548e5..9139834 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -76,7 +76,6 @@
      * 申请名称
      */
     @TableField("apply_name")
-    @ExcelProperty(value = "申请名称")
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
index 8c5b022..b7e9906 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml
@@ -81,7 +81,9 @@
             msa.approval_status,
             msa.apply_name,
             msa.apply_unit,
+            sd.SIMPLE_NAME AS apply_unit_name,
             msa.apply_person,
+            su.`NAME` AS apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -90,6 +92,8 @@
             msa.remark
         FROM
             equipment_apply msa
+            LEFT JOIN sys_user su ON msa.apply_person = su.id
+            LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id
         where msa.is_del = 0
         and msa.id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 4e6bf53..996e289 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -12,6 +12,7 @@
             meae.id AS apply_equipment_id,
             mfa.id AS equipment_id,
             msa.apply_no,
+            msa.apply_name,
             msa.apply_type,
             mfa.equipment_no,
             mfa.equipment_name,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 557e1be..3726366 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -45,6 +45,13 @@
     private String applyNo;
 
     /**
+     * 申请名称
+     */
+    @TableField("apply_name")
+    @ApiModelProperty(value = "申请名称", dataType = "String")
+    private String applyName;
+
+    /**
      * 申请类型-字典code
      */
     @NotBlank(message = "申请类型不能为空")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index d7548e5..9139834 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -76,7 +76,6 @@
      * 申请名称
      */
     @TableField("apply_name")
-    @ExcelProperty(value = "申请名称")
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 06a0d9f..093a56f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -197,7 +197,7 @@
             }
             boolean saveBatchFlg = true;
             // 新增附件列表
-            if(ObjectUtil.isNotEmpty(equipmentApply.getFileList()) && equipmentApply.getFileList().size()!=0){
+            if(!CollectionUtils.isEmpty(equipmentApply.getFileList())){
                 for (EquipmentApplyFile file : equipmentApply.getFileList()) {
                     file.setApplyId(id);
                 }