搜索bug修复

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerContactServiceImpl.java

@@ -152,7 +152,7 @@ public class CustomerContactServiceImpl extends ServiceImpl<CustomerContactMappe
         lqw.eq(bo.getCustomerId() != null, CustomerContact::getCustomerId, bo.getCustomerId());
         lqw.like(StringUtils.isNotBlank(bo.getContactNo()), CustomerContact::getContactNo, bo.getContactNo());
         lqw.like(StringUtils.isNotBlank(bo.getContactName()), CustomerContact::getContactName, bo.getContactName());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CustomerContact::getPhone, bo.getPhone());
+        lqw.like(StringUtils.isNotBlank(bo.getPhone()), CustomerContact::getPhone, bo.getPhone());
         lqw.eq(StringUtils.isNotBlank(bo.getOfficePhone()), CustomerContact::getOfficePhone, bo.getOfficePhone());
         lqw.eq(StringUtils.isNotBlank(bo.getOfficePhoneTwo()), CustomerContact::getOfficePhoneTwo, bo.getOfficePhoneTwo());
         lqw.eq(StringUtils.isNotBlank(bo.getGender()), CustomerContact::getGender, bo.getGender());

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/FollowUpLogServiceImpl.java

@@ -96,10 +96,21 @@ public class FollowUpLogServiceImpl implements IFollowUpLogService {
         lqw.eq(StringUtils.isNotBlank(bo.getObjectNo()), FollowUpLog::getObjectNo, bo.getObjectNo());
         lqw.eq(StringUtils.isNotBlank(bo.getCustomerNo()), FollowUpLog::getCustomerNo, bo.getCustomerNo());
         lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), FollowUpLog::getCustomerName, bo.getCustomerName());
-        lqw.like(StringUtils.isNotBlank(bo.getVisitor()), FollowUpLog::getVisitor, bo.getVisitor());
+        lqw.and(StringUtils.isNotBlank(bo.getVisitor()) || bo.getVisitorNo() != null,
+            wrapper -> wrapper
+                .like(StringUtils.isNotBlank(bo.getVisitor()), FollowUpLog::getVisitor, bo.getVisitor())
+                .or()
+                .eq(bo.getVisitorNo() != null, FollowUpLog::getVisitorNo, bo.getVisitorNo())
+        );
         lqw.like(StringUtils.isNotBlank(bo.getFollowPeopleName()), FollowUpLog::getFollowPeopleName, bo.getFollowPeopleName());
         lqw.eq(StringUtils.isNotBlank(bo.getCallTypeCode()), FollowUpLog::getCallTypeCode, bo.getCallTypeCode());
         lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), FollowUpLog::getPlatformCode, bo.getPlatformCode());
+        
+        java.util.Map<String, Object> params = bo.getParams();
+        if (params != null && params.get("beginTime") != null && params.get("endTime") != null) {
+            lqw.between(FollowUpLog::getCallDate, params.get("beginTime"), params.get("endTime"));
+        }
+
         // 增加排重和基础过滤
         lqw.eq(FollowUpLog::getIsDelete, 0);
         lqw.orderByDesc(FollowUpLog::getId);