|
|
@@ -90,10 +90,10 @@ public class AppealServiceImpl implements AppealService {
|
|
|
public Page<Appeal> showAppealsByPagination(Pageable page, String type, String fromApp,
|
|
|
Short status, String key, String keyword) {
|
|
|
|
|
|
- return appealDao.findAll(new Specification<Appeal>() {
|
|
|
+ Page<Appeal> appealPage = appealDao.findAll(new Specification<Appeal>() {
|
|
|
@Override
|
|
|
public Predicate toPredicate(Root<Appeal> root, CriteriaQuery<?> query,
|
|
|
- CriteriaBuilder builder) {
|
|
|
+ CriteriaBuilder builder) {
|
|
|
List<Predicate> predicates = new ArrayList<>();
|
|
|
// 申诉类型
|
|
|
if (!StringUtils.isEmpty(type)) {
|
|
|
@@ -132,6 +132,17 @@ public class AppealServiceImpl implements AppealService {
|
|
|
return null;
|
|
|
}
|
|
|
}, page);
|
|
|
+
|
|
|
+ if (appealPage.hasContent()) {
|
|
|
+ for (Appeal appeal : appealPage.getContent()) {
|
|
|
+ User appealUser = userDao.findByUserUU(appeal.getSubmitterUU());
|
|
|
+ if (appealUser != null) {
|
|
|
+ appeal.setAppealName(appealUser.getVipName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return appealPage;
|
|
|
}
|
|
|
|
|
|
@Override
|