fix:投诉模糊查询bug

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ComplaintController.java

@@ -9,7 +9,8 @@ import com.ylx.common.core.domain.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.enums.BusinessType;
-import com.ylx.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ylx.massage.domain.BusinessDevelopment;
 import com.ylx.massage.domain.Complaint;
 import com.ylx.massage.enums.ComplaintEnum;
 import com.ylx.massage.enums.Enumproject;
@@ -51,12 +52,7 @@ public class ComplaintController extends BaseController {
     @Log(title = "投诉新增查看", businessType = BusinessType.OTHER)
     public R selectAll(Page<Complaint> page, Complaint complaint) {
 
-        LambdaQueryWrapper<Complaint> complaintLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        complaintLambdaQueryWrapper.like(Complaint::getName, complaint.getName())
-                .eq(StringUtils.isNotBlank(complaint.getPhone()),Complaint::getPhone, complaint.getPhone())
-                .eq(Complaint::getDeptId, complaint.getDeptId())
-                .eq(Complaint::getComplaintType, complaint.getComplaintType())
-                .orderByDesc(Complaint::getCreateTime);
+
         Page<Complaint> complaints = complaintService.selectAll(page, complaint);
         return R.ok(complaints);
     }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Complaint.java

@@ -21,7 +21,7 @@ public class Complaint extends Model<Complaint> {
     //问题描述
     private String description;
     //投诉技师
-    private String name;
+    private String jsName;
     //图片
     private String photograph;
     //部门名称
@@ -66,12 +66,12 @@ public class Complaint extends Model<Complaint> {
         this.description = description;
     }
 
-    public String getName() {
-        return name;
+    public String getJsName() {
+        return jsName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setJsName(String jsName) {
+        this.jsName = jsName;
     }
 
     public String getPhotograph() {

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ComplaintServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ylx.massage.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.massage.enums.ComplaintEnum;
@@ -24,8 +26,15 @@ public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint
 
     @Override
     public Page<Complaint> selectAll(Page<Complaint> page, Complaint complaint) {
-
-        Page<Complaint> pageComplaint = this.page(page, new QueryWrapper<>(complaint));
+        LambdaQueryWrapper<Complaint> complaintLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        complaintLambdaQueryWrapper
+                .eq(StringUtils.isNotBlank(complaint.getPhone()),Complaint::getPhone, complaint.getPhone())
+                .eq(StringUtils.isNotBlank(complaint.getDeptId()),Complaint::getDeptId, complaint.getDeptId())
+                .eq(StringUtils.isNotBlank(complaint.getComplaintType()),Complaint::getComplaintType, complaint.getComplaintType())
+                .like(StringUtils.isNotBlank(complaint.getJsName()),Complaint::getJsName, complaint.getJsName())
+                .orderByDesc(Complaint::getCreateTime);
+
+        Page<Complaint> pageComplaint = this.page(page, complaintLambdaQueryWrapper);
 
         List<Complaint> records = pageComplaint.getRecords();