From 17b8fad8bbf13dd6f6e2c1e300856c52dce4f3ee Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 十二月 2025 14:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
index 7550c40..52f229e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
@@ -16,6 +16,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -41,8 +42,9 @@
private final TDeliberationVoteService tDeliberationVoteService;
private final TDeliberationVoteOptionService tDeliberationVoteOptionService;
private final TAppealServicesService tAppealServicesService;
+ private final TAppUserService appUserService;
- public ConvenienceController(THtmlConfigService tHtmlConfigService, TServiceGuideFileService tServiceGuideFileService, TConvenientInformationService tConvenientInformationService, TMicroWishService tMicroWishService, TokenService tokenService, TCommunityActivityService tCommunityActivityService, TCommunityActivityRegistrationService tCommunityActivityRegistrationService, TDeliberationVoteService tDeliberationVoteService, TDeliberationVoteOptionService tDeliberationVoteOptionService, TAppealServicesService tAppealServicesService) {
+ public ConvenienceController(THtmlConfigService tHtmlConfigService, TServiceGuideFileService tServiceGuideFileService, TConvenientInformationService tConvenientInformationService, TMicroWishService tMicroWishService, TokenService tokenService, TCommunityActivityService tCommunityActivityService, TCommunityActivityRegistrationService tCommunityActivityRegistrationService, TDeliberationVoteService tDeliberationVoteService, TDeliberationVoteOptionService tDeliberationVoteOptionService, TAppealServicesService tAppealServicesService, TAppUserService appUserService) {
this.tHtmlConfigService = tHtmlConfigService;
this.tServiceGuideFileService = tServiceGuideFileService;
this.tConvenientInformationService = tConvenientInformationService;
@@ -53,6 +55,7 @@
this.tDeliberationVoteService = tDeliberationVoteService;
this.tDeliberationVoteOptionService = tDeliberationVoteOptionService;
this.tAppealServicesService = tAppealServicesService;
+ this.appUserService = appUserService;
}
@@ -95,6 +98,19 @@
public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishListQuery query) {
Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
Page<TMicroWish> tMicroWishPage = tMicroWishService.page(page, new LambdaQueryWrapper<TMicroWish>().eq(TMicroWish::getWishType, 1).eq(TMicroWish::getStatus, 2).like(Objects.nonNull(query.getWishDescription()), TMicroWish::getWishDescription, query.getWishDescription()).orderByDesc(BaseModel::getCreateTime));
+ List<TMicroWish> records = tMicroWishPage.getRecords();
+ List<String> appUserIds = records.stream().map(TMicroWish::getAppUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(appUserIds)){
+ List<TAppUser> appUsers = appUserService.list(Wrappers.lambdaQuery(TAppUser.class)
+ .in(TAppUser::getId, appUserIds));
+ for (TMicroWish microWish : records) {
+ List<TAppUser> appUserList = appUsers.stream().filter(appUser -> microWish.getAppUserId().equals(appUser.getId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(appUserList)){
+ microWish.setUserName(appUserList.get(0).getNickName());
+ }
+ }
+ }
+
return R.ok(tMicroWishPage);
}
--
Gitblit v1.7.1