优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2446,7 +2446,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
         String businessTaskId = finBillApplication.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if (businessTaskId.equals(query.getTaskId())) {
+            if(query.getUserSid().equals(finBillApplication.getCreateBySid())){
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -2456,9 +2456,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
-                baseMapper.updateZZ(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
+            }else{
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                    return rb.success().setData(resultBean.getData());
+                }
             }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }