From c57421925562de5f2b74712195d67afd8d4afa6e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 26 十二月 2022 10:18:23 +0800
Subject: [PATCH] fix: 小程序群重复和是否进群
---
src/main/java/com/example/jz/controller/WxAppController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 9361afe..658cccc 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -121,10 +121,12 @@
role = user.getRole();
id = user.getId();
}
+ User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
HashMap<String, Object> loginMessage = new HashMap<>();
loginMessage.put("id", id);
loginMessage.put("token", token);
loginMessage.put("role", role);
+ loginMessage.put("time",user1.getUserIdcard());
return R.ok(loginMessage);
}
@@ -198,7 +200,7 @@
@GetMapping("/user/group/list")
public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
ArrayList<Map<String, Object>> list = new ArrayList<>();
- reportService.list((new QueryWrapper<Report>().eq("user_id", id)))
+ reportService.list((new QueryWrapper<Report>().eq("user_id", id)).groupBy("user_id"))
.forEach(item ->
{
GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId()));
--
Gitblit v1.8.0