From 97c79f2fe03a614f6b9ac2f23476dca2fd01ed0e Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 9 Aug 2022 18:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java   | 2 +-
 .../yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java  | 2 +-
 .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +-
 .../main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java
index cc8da2533f..534ed332c0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java
@@ -13,7 +13,7 @@ import lombok.Data;
 public class BaseMiddleQuery implements Query {
     private static final long serialVersionUID = 1582178443217852396L;
 
-    private String orgName;
+    private String name;
     @ApiModelProperty("参数错误：userSid不能为空")
     private String userSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
index 335179e1ce..c4a31cde3b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
@@ -112,7 +112,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
                 qw.eq("useOrgSid", resultBean.getData());
             }
         }
-        IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getOrgName());
+        IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getName());
         PagerVo<BaseMiddleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 4c9b78f75c..155b49f126 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -2391,7 +2391,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //总经理是否超权限
         variables.put("isPrice1", busSalesOrderPowerVo.getIsPower());
         //是否排产
-        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));
+//        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));
         return variables;
     }
 }
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 5663c5d378..c961bf473e 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -19,7 +19,7 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:3:485012"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:400004"),