From 2ab496873e94ba9a4f48f3dba85b5d8eb4099fbd Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 21 Apr 2025 11:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanSecondarySalesApplyService.java       | 19 +++++++++++--------
 .../base/basegoodssku/BaseGoodsSkuMapper.xml  |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
index 0d797ce09f..a68a4e6ce4 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
@@ -905,17 +905,20 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
 
                     //根据主车查询挂车信息
                     LoanReturnVehLedger loanReturnVehLedgerT = loanReturnVehLedgerService.selectByPSid(loanReturnVehLedger.getSid());
-                    if ("未处置".equals(loanReturnVehLedgerT.getDisposal())) {
-                        loanSecondarySalesVehVo = new LoanSecondarySalesVehVo();
-                        loanSecondarySalesVehVo.setVehType(loanReturnVehLedgerT.getVehType());
-                        loanSecondarySalesVehVo.setVehMark(loanReturnVehLedgerT.getVehMark());
-                        loanSecondarySalesVehVo.setVinNo(loanReturnVehLedgerT.getVinNo());
-                        loanSecondarySalesVehVo.setModelName(loanReturnVehLedgerT.getVehModel());
-                        loanSecondarySalesVehVo.setBusSid(loanReturnVehLedgerT.getSid());
-                        loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
+                    if(loanReturnVehLedgerT != null){
+                        if ("未处置".equals(loanReturnVehLedgerT.getDisposal())) {
+                            loanSecondarySalesVehVo = new LoanSecondarySalesVehVo();
+                            loanSecondarySalesVehVo.setVehType(loanReturnVehLedgerT.getVehType());
+                            loanSecondarySalesVehVo.setVehMark(loanReturnVehLedgerT.getVehMark());
+                            loanSecondarySalesVehVo.setVinNo(loanReturnVehLedgerT.getVinNo());
+                            loanSecondarySalesVehVo.setModelName(loanReturnVehLedgerT.getVehModel());
+                            loanSecondarySalesVehVo.setBusSid(loanReturnVehLedgerT.getSid());
+                            loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
+                        }
                     }
 
 
+
                 }
                 if ("挂车".equals(loanReturnVehLedger.getVehType())) {
                     if ("未处置".equals(loanReturnVehLedger.getDisposal())) {
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
index c72f33ba5d..71d5533801 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
@@ -133,6 +133,6 @@
                  SELECT @row_number := 0
              ) AS r
         WHERE spu.useOrgSid = #{deptSid}
-          AND spu.isDelete = 0
+          AND spu.isDelete = 0 and spu.goodsClassKey='004'
     </select>
 </mapper>