Commit a352b551 authored by zhengyi's avatar zhengyi

跟进客服因为查询条件为空不执行,这里对没有对应客户经理的跟进客服,进行非空参数添加,以保证不能获取数据的查询条件执行

parent 233d870a
......@@ -2462,8 +2462,8 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
//queryWrapper.in("ec.customer_service", reqVo.getCustomerIds());
//"AND (o.`salesman_id` = #{query.salesmanId} or o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service = #{query.salesmanId} ))",
// queryWrapper.and(wrapper -> wrapper.in("a.salesman_id", reqVo.getCustomerIds()).or().apply("a.customer_id in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service in ({0}))", ArrayUtil.join(reqVo.getCustomerIds().toArray(), ",")));
queryWrapper.and(wrapper -> wrapper.in("a.salesman_id", reqVo.getCustomerIds()));
queryWrapper.and(wrapper -> wrapper.in("a.salesman_id", reqVo.getCustomerIds()).or().apply("a.customer_id in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service in ({0}))", ArrayUtil.join(reqVo.getCustomerIds().toArray(), ",")));
// queryWrapper.and(wrapper -> wrapper.in("a.salesman_id", reqVo.getCustomerIds()));
//queryWrapper.in("a.salesman_id", reqVo.getCustomerIds());
}
......
package cn.iocoder.yudao.module.order.controller.admin.orderExceptionResult.orderException;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
......@@ -74,6 +75,11 @@ public class OrderExceptionController {
List<String> serviceIdList =
orderExceptionService.getCustomerServiceListById(
Long.parseLong(query.getSalesmanId()));
if(CollectionUtil.isEmpty(serviceIdList)){
serviceIdList = new ArrayList<>();
// 避免因为查询条件为空不执行,这里对没有对应客户经理的跟进客服,进行非空参数添加,以保证不能获取数据的查询条件执行
serviceIdList.add("0");
}
List<String> customerServiceList = query.getCustomerIds();
if (null == customerServiceList) {
customerServiceList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment