diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index f85d272..5172829 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -26,7 +26,8 @@
             su.`NAME` AS apply_person_name,
             msa.apply_unit,
             sd.SIMPLE_NAME AS apply_unit_name,
-            msa.apply_name
+            msa.apply_name,
+            msa.process_id
         FROM
             equipment_standard_apply msa
                 LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id
@@ -52,8 +53,8 @@
         <if test="request.standardName != null and request.standardName !=''">
             and mse.standard_name like concat('%', #{request.standardName}, '%')
         </if>
-        <if test="request.organizeNo != null and request.organizeNo !=''">
-            and su1.dept_id = #{request.organizeNo}
+        <if test="request.applyUnit != null and request.applyUnit !=''">
+            and msa.apply_unit = #{request.applyUnit}
         </if>
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index f85d272..5172829 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -26,7 +26,8 @@
             su.`NAME` AS apply_person_name,
             msa.apply_unit,
             sd.SIMPLE_NAME AS apply_unit_name,
-            msa.apply_name
+            msa.apply_name,
+            msa.process_id
         FROM
             equipment_standard_apply msa
                 LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id
@@ -52,8 +53,8 @@
         <if test="request.standardName != null and request.standardName !=''">
             and mse.standard_name like concat('%', #{request.standardName}, '%')
         </if>
-        <if test="request.organizeNo != null and request.organizeNo !=''">
-            and su1.dept_id = #{request.organizeNo}
+        <if test="request.applyUnit != null and request.applyUnit !=''">
+            and msa.apply_unit = #{request.applyUnit}
         </if>
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 48f9877..f189121 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest;
+import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
@@ -93,9 +94,6 @@
     @Resource
     private RuntimeService runtimeService;
 
-    @Resource
-    private DeptMapper deptMapper;
-
     @Override
     public Page<EquipmentStandardApply> standardEquipmentApplyList(Page<EquipmentStandardApply> page, StandardEquipmentApplyRequest request) throws Exception {
         Page<EquipmentStandardApply> resultPage;
@@ -172,7 +170,9 @@
         // 通过id获取申请记录
         EquipmentStandardApply result = meterStandardApplyMapper.selectApplyInfo(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
-        EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        StandardEquipmentRequest request = new StandardEquipmentRequest();
+        request.setId(Long.parseLong(result.getStandardEquipmentId()));
+        EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.listPage(request);
         if(ObjectUtil.isEmpty(standardEquipment)){
             throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
         }
@@ -319,9 +319,7 @@
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
             remove(meterStandardApply.getId());
-            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
-            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
-            if(fileSaveFlag && equipmentFlag){
+            if(saveBatch(meterStandardApply)){
                 baseApprovalService.failUpdate(meterStandardApply.getProcessId());
                 return ReturnUtil.success();
             }