|
|
@@ -1,5 +1,6 @@
|
|
|
package com.ylx.massage.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
@@ -31,10 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -763,11 +761,13 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
|
|
|
LambdaQueryWrapper<TJs> jsQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
jsQueryWrapper.like(TJs::getcNickName, technicianName);
|
|
|
List<TJs> technicians = tJsMapper.selectList(jsQueryWrapper);
|
|
|
- if (technicians == null || technicians.isEmpty()) {
|
|
|
- throw new ServiceException("技师不存在");
|
|
|
+ if(CollUtil.isNotEmpty(technicians)){
|
|
|
+ // 构建查询条件,查询所有匹配的技师的动态
|
|
|
+ queryWrapper.in(TechnicianMoment::getTechnicianId, technicians.stream().map(TJs::getId).collect(Collectors.toList()));
|
|
|
+ }else{
|
|
|
+ // 没有匹配的技师,查询空字符串列表
|
|
|
+ queryWrapper.in(TechnicianMoment::getTechnicianId, Collections.singleton(""));
|
|
|
}
|
|
|
- // 构建查询条件,查询所有匹配的技师的动态
|
|
|
- queryWrapper.in(TechnicianMoment::getTechnicianId, technicians.stream().map(TJs::getId).collect(Collectors.toList()));
|
|
|
}
|
|
|
|
|
|
// 时间范围查询
|