|
|
@@ -762,11 +762,12 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
|
|
|
//根据技师姓名查询技师的ID
|
|
|
LambdaQueryWrapper<TJs> jsQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
jsQueryWrapper.like(TJs::getcNickName, technicianName);
|
|
|
- TJs technician = tJsMapper.selectOne(jsQueryWrapper);
|
|
|
- if (technician == null) {
|
|
|
+ List<TJs> technicians = tJsMapper.selectList(jsQueryWrapper);
|
|
|
+ if (technicians == null || technicians.isEmpty()) {
|
|
|
throw new ServiceException("技师不存在");
|
|
|
}
|
|
|
- queryWrapper.eq(TechnicianMoment::getTechnicianId, technician.getId());
|
|
|
+ // 构建查询条件,查询所有匹配的技师的动态
|
|
|
+ queryWrapper.in(TechnicianMoment::getTechnicianId, technicians.stream().map(TJs::getId).collect(Collectors.toList()));
|
|
|
}
|
|
|
|
|
|
// 时间范围查询
|
|
|
@@ -896,6 +897,8 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
|
|
|
vo.setTitle((String) result.get("title"));
|
|
|
vo.setContent((String) result.get("content"));
|
|
|
vo.setMediaType((Integer) result.get("media_type"));
|
|
|
+ vo.setAuditStatus((Integer) result.get("audit_status"));
|
|
|
+ vo.setRejectReason((String) result.get("reject_reason"));
|
|
|
|
|
|
// 4. 处理媒体URL列表
|
|
|
String mediaUrlsStr = (String) result.get("media_urls");
|