From 2fe365f7118b10095431ae2ba737a03b5cf3c87a Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 22 Mar 2023 15:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/biz/crmcustomertemp/CrmCustomerTempMapper.java      | 5 ++---
 .../anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml | 5 +++--
 .../crm/biz/crmcustomertemp/CrmCustomerTempService.java     | 6 +++++-
 .../saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java      | 4 +---
 .../saleOrderRetVeh/AppBusSalesOrderRetVehService.java      | 1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
index 1f0859902b..3ee99685ee 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.crm.biz.crmcustomertemp;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -53,8 +54,6 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
      * 手机端获取客户管理列表
      *
      * @param page
-     * @param staffSid
-     * @param name
      * @return
      */
     IPage<AppCrmCustomerTempVo> getCustomerTempListByUserSid(IPage<AppCrmCustomerTempQuery> page, @Param(Constants.WRAPPER) Wrapper<CrmCustomerTemp> qw);
@@ -118,7 +117,7 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
 
     CrmCustomerTempVo selByMobile(@Param("mobile") String mobile);
 
-    List<CrmCustomerTempListVo> selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid);
+    List<CrmCustomerTempListVo> selectCustomerList(@Param(Constants.WRAPPER) QueryWrapper<CrmCustomerTempListQuery> qw);
 
     CrmCustomerTempVo selectNo(String customerNo);
 
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 8c68636a41..9221799df6 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -203,8 +203,9 @@
     <select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
         select ct.name, ct.sid, ct.mobile, ct.customerNo
         from crm_customer_temp ct
-        where createOrgSid = #{orgSid}
-          and staffSid = #{staffSid}
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectNo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index db50912502..a0cac7fbfa 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -979,13 +979,17 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String staffSid = query.getStaffSid();
         //根据用户sid查询分公司sid
 //        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        QueryWrapper<CrmCustomerTempListQuery> qw = new QueryWrapper<>();
         String orgSid = "";
         if(StringUtils.isNotBlank(query.getOrgPath())){
             orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+            qw.eq("createOrgSid",orgSid);
         }else{
             orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+            qw.eq("createOrgSid",orgSid);
         }
-        List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(orgSid, staffSid);
+        qw.eq("staffSid",staffSid);
+        List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java
index 93117e7a8c..50eeebd22d 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class SubmitOrderRetVehDto implements Dto {
+public class SubmitOrderRetVehDto extends OrderRetVehSubmitDto {
     private static final long serialVersionUID = -3341005368687646398L;
 
     @ApiModelProperty("销售订单退车申请sid")
@@ -23,6 +23,4 @@ public class SubmitOrderRetVehDto implements Dto {
 
     @ApiModelProperty("组织全路径")
     private String orgPath;
-
-    private OrderRetVehSubmitDto info;
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java
index eb1400462c..5407742cd0 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java
@@ -56,6 +56,7 @@ public class AppBusSalesOrderRetVehService {
         SubmitBusSalesOrderReturnVehApplyDto submitBusSalesOrderReturnVehApplyDto = new SubmitBusSalesOrderReturnVehApplyDto();
         BeanUtil.copyProperties(dto, submitBusSalesOrderReturnVehApplyDto);
         submitBusSalesOrderReturnVehApplyDto.setInstanceId(dto.getProcInsId());
+        submitBusSalesOrderReturnVehApplyDto.setOrgPath(dto.getOrgSidPath());
         ResultBean resultBean = busSalesOrderReturnVehApplyFeign.submitVehicleApply(submitBusSalesOrderReturnVehApplyDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());