修改代码

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -138,12 +138,6 @@ public class ContingencyAction implements CustomerAction {
     @Value("${maparea.action.is-area}")
     private String isArea;
 
-//    @Value("${plan.default.roleCode}")
-//    private String defaultRoleCode;
-
-    @Value("${plan.web.isUpdatePlanStep}")
-    private Boolean isUpdatePlanStep;
-
     private static Map<String, String> OPERATE_RECORD_ID = new HashMap<>();
 
     private static Map<String, ContingencyPlanInstance> OPERATE_CONTINGENCYPLAN_INSTANCE = new HashMap<>();
@@ -465,14 +459,13 @@ public class ContingencyAction implements CustomerAction {
             result.add(tempmap1);
             this.sendcmd("optionarea", paramObj, result);
 
-            if (!isUpdatePlanStep) {
-                try {
-                    ButtonJsonVO buttonJsonVO = JSONObject.parseObject(buttonJson, ButtonJsonVO.class);
-                    Map<String, Object> map = buttonJsonVO.getOperate().get(buttonJsonVO.getOperate().size() - 1);
-                    iContingencyInstance.fire(batchNo, buttonJsonVO.getStepCode(), buttonJson, contingencyPlanId, map.get("code").toString(), "CANCEL_0", "A", "false", "false",RequestContext.getToken(), RequestContext.getProduct(), RequestContext.getAppKey(), null);
-                } catch (Exception e) {
-                    log.error("optionarea 加入队列失败-->" + e.getMessage());
-                }
+            // 默认调用当前动作
+            try {
+                ButtonJsonVO buttonJsonVO = JSONObject.parseObject(buttonJson, ButtonJsonVO.class);
+                Map<String, Object> map = buttonJsonVO.getOperate().get(buttonJsonVO.getOperate().size() - 1);
+                iContingencyInstance.fire(batchNo, buttonJsonVO.getStepCode(), buttonJson, contingencyPlanId, map.get("code").toString(), "CANCEL_0", "A", "false", "false",RequestContext.getToken(), RequestContext.getProduct(), RequestContext.getAppKey(), null);
+            } catch (Exception e) {
+                log.error("optionarea 加入队列失败-->" + e.getMessage());
             }
 
             MessageVO messageVO = new MessageVO();