Browse Source

fix:pc 投诉记录调整

wrj 7 months ago
parent
commit
24f6bbe953

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

@@ -46,8 +46,9 @@ public class ComplaintController extends BaseController {
     @ApiOperation("分页查询所有数据")
     @Log(title = "投诉新增查看", businessType = BusinessType.OTHER)
     public R selectAll(Page<Complaint> page, Complaint complaint) {
-
-
+        if(null != this.getDeptId() && this.getDeptId() != 100){
+            complaint.setDeptId(this.getDeptId().toString());
+        }
         Page<Complaint> complaints = complaintService.selectAll(page, complaint);
         return R.ok(complaints);
     }

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

@@ -32,6 +32,7 @@ public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint
                 .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())
+                .eq(StringUtils.isNotBlank(complaint.getDeptId()), Complaint::getDeptId, complaint.getDeptId())
                 .orderByDesc(Complaint::getCreateTime);
 
         Page<Complaint> pageComplaint = this.page(page, complaintLambdaQueryWrapper);