|
|
@@ -2,6 +2,7 @@ package com.yingpai.miniapp.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.yingpai.miniapp.domain.MiniappUser;
|
|
|
import com.yingpai.miniapp.domain.UserFeedback;
|
|
|
import com.yingpai.miniapp.domain.bo.UserFeedbackBo;
|
|
|
import com.yingpai.miniapp.domain.vo.UserFeedbackVo;
|
|
|
@@ -33,8 +34,8 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
|
|
|
Page<UserFeedback> page = feedbackMapper.selectPage(pageQuery.build(), wrapper);
|
|
|
|
|
|
List<UserFeedbackVo> voList = page.getRecords().stream()
|
|
|
- .map(this::toVo)
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .map(this::toVo)
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
Page<UserFeedbackVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
|
|
|
voPage.setRecords(voList);
|
|
|
@@ -45,8 +46,8 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
|
|
|
public List<UserFeedbackVo> queryList(UserFeedbackBo bo) {
|
|
|
LambdaQueryWrapper<UserFeedback> wrapper = buildQueryWrapper(bo);
|
|
|
return feedbackMapper.selectList(wrapper).stream()
|
|
|
- .map(this::toVo)
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .map(this::toVo)
|
|
|
+ .collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -73,12 +74,12 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
|
|
|
|
|
|
// 如果有昵称或手机号查询,需要先查用户ID
|
|
|
if (StringUtils.isNotBlank(bo.getNickname()) || StringUtils.isNotBlank(bo.getPhone())) {
|
|
|
- List<Long> userIds = userMapper.selectList(new LambdaQueryWrapper<com.yingpai.miniapp.domain.MiniappUser>()
|
|
|
- .like(StringUtils.isNotBlank(bo.getNickname()), com.yingpai.miniapp.domain.MiniappUser::getNickname, bo.getNickname())
|
|
|
- .like(StringUtils.isNotBlank(bo.getPhone()), com.yingpai.miniapp.domain.MiniappUser::getPhone, bo.getPhone()))
|
|
|
- .stream()
|
|
|
- .map(com.yingpai.miniapp.domain.MiniappUser::getId)
|
|
|
- .collect(Collectors.toList());
|
|
|
+ List<Long> userIds = userMapper.selectList(new LambdaQueryWrapper<MiniappUser>()
|
|
|
+ .like(StringUtils.isNotBlank(bo.getNickname()), MiniappUser::getNickname, bo.getNickname())
|
|
|
+ .like(StringUtils.isNotBlank(bo.getPhone()), MiniappUser::getPhone, bo.getPhone()))
|
|
|
+ .stream()
|
|
|
+ .map(MiniappUser::getId)
|
|
|
+ .collect(Collectors.toList());
|
|
|
if (userIds.isEmpty()) {
|
|
|
wrapper.eq(UserFeedback::getUserId, -1L); // 无匹配用户
|
|
|
} else {
|