From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 0f5f3f5..ed615b7 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -143,6 +143,11 @@
System.out.println("根据id获取用户："+id);
return appUserService.getById(id);
}
+ // 获取所有用户
+ @PostMapping("/getAppUserAll")
+ public List<AppUser> getAppUserAll() {
+ return appUserService.list();
+ }
@PostMapping("/getBaseUserById")
public R<Map<String, Object>> getBaseUserById(@RequestParam("id") Long id) {
@@ -566,7 +571,7 @@
if (result == null || result.get("total_points") == null) {
userStatistics.setTotalScore(0L);
}else {
- userStatistics.setTotalScore(((BigDecimal) result.get("total_points")).longValue());
+ userStatistics.setTotalScore(Long.valueOf(result.get("total_points").toString()));
}
//条件构造 消费积分现金支付金额
queryWrapper.clear();
--
Gitblit v1.7.1