From 4dc4e8d0d029ac1076728c4a8f2ea27d7ec5a3fa Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Sat, 2 Nov 2024 09:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BA=93=E5=AD=98=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86-=E5=90=8D=E7=A7=B0=E7=AD=89?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crm-admin/src/main/resources/application-dev.yml          | 2 +-
 .../mapper_oracle/stock/ClientStockReportMapper.xml       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crm-admin/src/main/resources/application-dev.yml b/crm-admin/src/main/resources/application-dev.yml
index 1ad5619..30310ac 100644
--- a/crm-admin/src/main/resources/application-dev.yml
+++ b/crm-admin/src/main/resources/application-dev.yml
@@ -54,7 +54,7 @@ userinfo:
   # 名称
   name: crmproject
   # 积木报表导出pdf的url
-  jmUrl: http://192.168.1.124:9091/jmreport/exportPdf
+  jmUrl: http://192.168.0.124:9091/jmreport/exportPdf
   # 发货单的积木报表id
   invConfigId: 904237003519217664
   # 微信支付API调用服务器的IP
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
index 84a0772..8d96b42 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
@@ -100,16 +100,16 @@
             AND t0.id = #{clientId}
         </if>
         <if test="uecode !=null and uecode !=''">
-            AND t0.uecode = #{uecode}
+            AND t0.uecode LIKE '%' || #{uecode} || '%'
         </if>
         <if test="clientName !=null and clientName !=''">
-            AND t0.distributor_name = #{clientName}
+            AND t0.distributor_name  LIKE '%' || #{clientName} || '%'
         </if>
         <if test="staffName !=null and staffName !=''">
-            AND csui.name = #{staffName}
+            AND csui.name LIKE '%' || #{staffName} || '%'
         </if>
         <if test="areaName !=null and areaName !=''">
-            AND cmai.area_name = #{areaName}
+            AND cmai.area_name LIKE '%' || #{areaName} || '%'
         </if>
         <if test="flag !=null and flag !=''">
             <!-- 前端传营销区域 -->