Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@@ -790,14 +790,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(1);
                     flowNodeQuery.setNodeNames("发起申请");
                     flowNodeQuery.setParameter("优惠金额");
                     flowNodeQuery.setValue(discountAmountC);
                     boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("前台主管审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("自有二级站长审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
@@ -841,15 +844,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(1);
                     flowNodeQuery.setNodeNames("发起申请");
                     flowNodeQuery.setParameter("优惠金额");
                     flowNodeQuery.setValue(discountAmountC);
                     boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
-
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("前台主管审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("自有二级站长审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
@@ -2434,7 +2439,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                         cost = new BigDecimal(s.getGoodsCost());
                     }
                     SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
-                    flowNodeQuery.setType(0);
+                    flowNodeQuery.setType(1);
                     flowNodeQuery.setFlowName("商品配件销售结算申请");
                     flowNodeQuery.setCreateOrgName(vo.getUseOrgName());
                     flowNodeQuery.setProcDefId("process_q2p7s958752");
@@ -2442,14 +2447,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                     flowNodeQuery.setParameter("优惠金额");
                     flowNodeQuery.setValue(discountAmountC);
                     boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("发起申请");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("配件主管审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);
                     boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
+                    flowNodeQuery.setType(0);
                     flowNodeQuery.setNodeNames("自有二级站长审批");
                     flowNodeQuery.setParameter("销售价折扣");
                     flowNodeQuery.setValue(discountC);