Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7367,6 +7367,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<SalesLenderVo> rb = ResultBean.fireFail();
         SalesLenderVo salesLenderVo = new SalesLenderVo();
         salesLenderVo.setSaleOrderSid(saleOrderSid);
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
+        if (busSalesOrderBorrower != null) {
+            return rb.setMsg("该客户已存在贷款人中");
+        }
         //订单总台数
         BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid);
         //查询该销售订单已确定的数量

anrui-riskcenter-ui/src/views/capital/capital.vue

@@ -194,7 +194,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
-      this.listQuery.params.orhPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then(response => {
         this.listLoading = false

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -22,7 +22,7 @@
     </select>
 
     <select id="getOrderLoanPagerList" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo">
-        select distinct(la.idCard),la.custSid,
+        select distinct la.custSid,la.idCard,
         la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,
         la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
@@ -62,6 +62,8 @@
     </select>
 
     <select id="selectBySid" resultType="java.lang.String">
-        select borrowerSid from anrui_buscenter.bus_sales_order_vehicle where salesOrderSid = #{orderSid}
+        select bb.customSid from anrui_buscenter.bus_sales_order_vehicle bv
+        left join anrui_buscenter.bus_sales_order_borrower bb on bb.sid = bv.borrowerSid
+        where bv.salesOrderSid = #{orderSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -568,6 +568,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 qw.like("la.idCard", query.getIdCard());
             }
             qw.eq("la.isDelete", 0);
+            qw.eq("la.state",2);
             //排除销售订单已选择的贷款人
             List<String> borrowSidList = baseMapper.selectBySid(query.getOrderSid());
             borrowSidList.removeAll(Collections.singleton(null));

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -797,8 +797,10 @@ public class AppBusSalesOrderService {
         ResultBean<PagerVo<LoanPreloansVo>> rb = ResultBean.fireFail();
         PagerQuery<LoanPreloanQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<LoanPreloanVo>> resultBean = loanPreloanCreditApplyFeign.getOrderLoanPagerList(pq);
-        List<LoanPreloansVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList());
         PagerVo<LoanPreloansVo> v = new PagerVo<>();
+        if(resultBean.getData() != null){
+            List<LoanPreloansVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList());
+
             BeanUtil.copyProperties(resultBean.getData(), v);
             String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
             String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.DetailCreditReviewActivity";
@@ -811,5 +813,10 @@ public class AppBusSalesOrderService {
             }
             v.setRecords(voList);
             return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+        }else{
+            return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+        }
+
+
     }
 }