Merge remote-tracking branch 'origin/master'

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");

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>