修改

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())) {

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>