From 50e0cee10c484414dafd91728b613af3f59b1cd5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 14 Aug 2023 14:21:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?=
 =?UTF-8?q?=E4=B9=B0=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
index a9a3f24cec..a4e09e18df 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
@@ -48,7 +48,7 @@
               <span>品牌</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>是否需要付款</span>

From bd66d396f7e42383043b404b05d56881e44f3e18 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 14 Aug 2023 14:59:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=85=E4=BA=A4=E8=BD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=BB=E8=BE=91=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=80=E5=94=AE=E4=B8=93=E5=91=98=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandoverwait/BusHandoverWaitService.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
index 1fb65830c3..8c7bf06db0 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
@@ -42,6 +42,9 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
         QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
         if (params != null) {
             String orgPath = params.getOrgPath();
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                qw.eq("bh.createBySid", params.getUserSid());
+            }
             if (StringUtils.isNotBlank(orgPath)) {
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("bh.useOrgSid", orgPath);
@@ -100,7 +103,7 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
 //                qw.notIn("vinSid", vinSidList);
 //            }
 //        }
-//        qw.eq("createBySid", query.getUserSid());
+        qw.eq("createBySid", query.getUserSid());
         qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");