crm

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -114,7 +114,7 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.companyId != null  and   maps.companyId != \"-1\" '> " + "and so.company_id =#{maps.companyId} " + "</if>" +
             "<if test = ' maps.companyId == \"-1\" '> and so.company_id is null </if>" +
             "<if test = 'maps.deliveryStatus != null    '> and so.delivery_status =#{maps.deliveryStatus} </if>" +
-            "<if test = 'maps.customerId != null    '> and so.customer_id =#{customerId} </if>" +
+            "<if test = 'maps.customerId != null    '> and so.customer_id =#{maps.customerId} </if>" +
             "<if test = 'maps.deliveryPayStatus != null    '> and so.delivery_pay_status =#{maps.deliveryPayStatus} </if>" +
             "<if test = 'maps.tuiMoneyStatus != null    '> and so.tui_money_status =#{maps.tuiMoneyStatus} </if>" +
             "<if test = 'maps.deptId != null    '>   AND (so.dept_id = #{maps.deptId} OR so.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) </if>" +

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -593,7 +593,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and so.delivery_status =#{maps.deliveryStatus}
         </if>
         <if test='maps.customerId != null '>
-            and so.customer_id =#{customerId}
+            and so.customer_id =#{maps.customerId}
         </if>
         <if test='maps.deliveryPayStatus != null '>
             and so.delivery_pay_status =#{maps.deliveryPayStatus}