From 3af68ab1bdc20ead38c1521e7b48f32ca6aa2945 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 十二月 2025 10:45:47 +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/UserIndexController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
index fae247d..e64795e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
@@ -70,7 +70,7 @@
@ApiOperation(value = "个人中心--托育服务记录详情",response = TChildcareServices.class)
@GetMapping(value = "/getChildcareServicesDetail/{id}")
- public R<TChildcareServices> getChildcareServicesList(@PathVariable String id) {
+ public R<TChildcareServices> getChildcareServicesDetail(@PathVariable String id) {
TChildcareServices childcareServices = tChildcareServicesService.getById(id);
return R.ok(childcareServices);
}
@@ -109,7 +109,10 @@
public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishStatusQuery query) {
String userId = tokenService.getLoginUserApplet().getUserId();
Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
- Page<TMicroWish> microWishPage = tMicroWishService.page(page, Wrappers.<TMicroWish>lambdaQuery().eq(TMicroWish::getAppUserId, userId).eq(Objects.nonNull(query.getStatus()), TMicroWish::getStatus, query.getStatus()).orderByDesc(BaseModel::getCreateTime));
+ Page<TMicroWish> microWishPage = tMicroWishService.page(page, Wrappers.<TMicroWish>lambdaQuery()
+ .eq(TMicroWish::getAppUserId, userId)
+ .eq(Objects.nonNull(query.getStatus()), TMicroWish::getStatus, query.getStatus())
+ .orderByDesc(BaseModel::getCreateTime));
return R.ok(microWishPage);
}
--
Gitblit v1.7.1