diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index de1703d..4df293d 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -670,6 +670,10 @@ public class CustomerService { // PageHelper.startPage(pageNum, pageSize); com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum,pageSize); + if(startDate.getTime() == endDate.getTime()){ + endDate = null; + } + if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) { // 0、新增好友 1、累计好友 if (flag == 0) { diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml index e1de24d..c90fcf2 100644 --- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml +++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml @@ -37,10 +37,10 @@ CONCAT('%',#{search},'%')) - and date(t1.create_time) >= #{startDate} + and t1.create_time >= #{startDate} - and date(t1.create_time) <= #{endDate} + and t1.create_time <= #{endDate} order by t1.create_time desc @@ -79,10 +79,10 @@ CONCAT('%',#{search},'%')) - and date(t1.create_time) >= #{startDate} + and t1.create_time >= #{startDate} - and date(t1.create_time) <= #{endDate} + and t1.create_time <= #{endDate} order by t1.create_time desc