diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index ec3d893..bb2627d 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,7 +125,7 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no
         from eqpt_equipment_info_approval t
         where approval_status = '3' and approval_type != 3),
         r as (select *

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index ec3d893..bb2627d 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,7 +125,7 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no
         from eqpt_equipment_info_approval t
         where approval_status = '3' and approval_type != 3),
         r as (select *
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
index 8106ab2..ec37f01 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
@@ -253,7 +253,7 @@
 
     @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id")
     @TableField("use_position_id")
-    private String usePositionId;
+    private Long usePositionId;
 
     /**
      * 使用岗位
@@ -268,7 +268,7 @@
      */
     @ApiModelProperty(value = "负责人id",notes = "负责人id")
     @TableField("director_id")
-    private String directorId;
+    private Long directorId;
 
     /**
      * 负责人

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index ec3d893..bb2627d 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,7 +125,7 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no
         from eqpt_equipment_info_approval t
         where approval_status = '3' and approval_type != 3),
         r as (select *
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
index 8106ab2..ec37f01 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
@@ -253,7 +253,7 @@
 
     @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id")
     @TableField("use_position_id")
-    private String usePositionId;
+    private Long usePositionId;
 
     /**
      * 使用岗位
@@ -268,7 +268,7 @@
      */
     @ApiModelProperty(value = "负责人id",notes = "负责人id")
     @TableField("director_id")
-    private String directorId;
+    private Long directorId;
 
     /**
      * 负责人
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 909e654..7690903 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -130,10 +130,19 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
-        if(StrUtil.isBlank(agreeRequest.getComments())){
-            agreeRequest.setComments("同意");
+        try {
+            if(StrUtil.isBlank(agreeRequest.getComments())){
+                agreeRequest.setComments("同意");
+            }
+            return baseApprovalService.agree(agreeRequest);
+        }catch (FlowableException e){
+            log.error(e.getMessage());
+            if(e.getMessage().contains("No outgoing sequence flow")){
+                throw new BusinessException(501,"无可执行流程，请检查流程配置");
+            }else {
+                throw new BusinessException(501,"流程异常");
+            }
         }
-        return baseApprovalService.agree(agreeRequest);
     }
 
     @Override