|
@@ -197,7 +197,7 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
|
|
|
lawyerUser.eq(LawyerUser::getId, appeal.getLawyerUserId());
|
|
lawyerUser.eq(LawyerUser::getId, appeal.getLawyerUserId());
|
|
|
LawyerUser lifeUser = lawyerUserMapper.selectOne(lawyerUser);
|
|
LawyerUser lifeUser = lawyerUserMapper.selectOne(lawyerUser);
|
|
|
if (lifeUser == null) {
|
|
if (lifeUser == null) {
|
|
|
- log.warn("评价用户不存在,userId={}", lifeUser.getId());
|
|
|
|
|
|
|
+ log.warn("律师用户不存在,lawyerUserId={}", appeal.getLawyerUserId());
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
LambdaQueryWrapper<OrderReview> orderReviewLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<OrderReview> orderReviewLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
@@ -547,16 +547,23 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
|
|
|
pageNum, pageSize, status, lawyerUserId);
|
|
pageNum, pageSize, status, lawyerUserId);
|
|
|
List<CommentAppealVo> appealList = new ArrayList<>();
|
|
List<CommentAppealVo> appealList = new ArrayList<>();
|
|
|
//status 3 查全部
|
|
//status 3 查全部
|
|
|
- if (status == 3) {
|
|
|
|
|
|
|
+ if (status != null && status == 3) {
|
|
|
appealList = baseMapper.getAppealHistoryList(null, lawyerUserId);
|
|
appealList = baseMapper.getAppealHistoryList(null, lawyerUserId);
|
|
|
} else {
|
|
} else {
|
|
|
// 查询申诉历史列表
|
|
// 查询申诉历史列表
|
|
|
appealList = baseMapper.getAppealHistoryList(status, lawyerUserId);
|
|
appealList = baseMapper.getAppealHistoryList(status, lawyerUserId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 防止空指针异常:如果查询结果为null,初始化为空列表
|
|
|
|
|
+ if (appealList == null) {
|
|
|
|
|
+ appealList = new ArrayList<>();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 处理数据转换(图片列表等)
|
|
// 处理数据转换(图片列表等)
|
|
|
for (CommentAppealVo vo : appealList) {
|
|
for (CommentAppealVo vo : appealList) {
|
|
|
- processAppealVo(vo);
|
|
|
|
|
|
|
+ if (vo != null) {
|
|
|
|
|
+ processAppealVo(vo);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
ListToPage.setPage(appealList, pageNum, pageSize);
|
|
ListToPage.setPage(appealList, pageNum, pageSize);
|