From ce80aaac981c8f60e77a11a426f1d939abdf8630 Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Mon, 4 Jul 2022 16:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/scmvehicleexamine/AppScmVehicleExamineDto.java    | 2 +-
 .../biz/scmvehicleexamine/ScmVehicleExamineService.java   | 8 ++++----
 .../api/supplychain/scmvehicleexamine/AppExamineDto.java  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
index c1895fd318..5b8a2610dd 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
@@ -12,7 +12,7 @@ import java.util.List;
 public class AppScmVehicleExamineDto implements Dto {
 
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private String vin;
 
     @ApiModelProperty("订单类型")
     private String purchaseKey;
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index 8b3f24ab92..c6788321b3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -192,7 +192,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public IPage<AppScmVehicleExaminePageVo> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
         IPage<AppScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleExaminePageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleExaminePageQuery params = pagerQuery.getParams();
@@ -316,7 +316,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+        if (StringUtils.isBlank(dto.getVin())) {
             return rb.setMsg("车架号不能为空");
         }
         if (dto.getCarInspectedImage().size() <= 0) {
@@ -334,7 +334,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isNotBlank(dto.getInspectedSid())) {
             ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
             if ("1".equals(scmVehicleExamine.getInspectionResult())) {
-                scmVehicleExamine.setVinNo(dto.getVinNo());
+                scmVehicleExamine.setVinNo(dto.getVin());
                 scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
                 scmVehicleExamine.setModelName(dto.getModel());
                 scmVehicleExamine.setConfigName(dto.getConfig());
@@ -391,7 +391,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+        if (StringUtils.isBlank(dto.getVin())) {
             return rb.setMsg("车架号不能为空");
         }
         if (dto.getCarInspectedImage().size() <= 0) {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java
index 2b798ec45a..65354516cf 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java
@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 public class AppExamineDto implements Dto {
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private String vin;
 
     @ApiModelProperty("订单类型")
     private String purchaseKey;