From e538cdf006a72d0f3cb8dd22d450ad5db77090fd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 30 七月 2024 14:25:19 +0800
Subject: [PATCH] 花城 修改小程序微信用户管理报错4
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index da84237..5fc82e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -258,6 +258,7 @@
@PostMapping("detailuser")
public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
return userService.detailUser(userId);
+// return userService.getUserInfo(userId+"");
}
/**
@@ -806,11 +807,10 @@
*/
@PostMapping("detailusercomunity")
public R detailUserComunity(@RequestParam("userId") Long userId) {
- CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
- if (userId < 100000000l) {
+ CommunityUserInfoVO communityUserInfoVO;
+ communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
+ if (communityUserInfoVO==null) {
communityUserInfoVO = userService.detailUserComunity(userId);
- } else {
- communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
}
return R.ok(communityUserInfoVO);
}
@@ -1457,6 +1457,11 @@
return userService.getCommunityList(name,id);
}
+ @GetMapping("/getAllCommunityList")
+ public R getAllCommunityList(){
+ return userService.getAllCommunityList();
+ }
+
@GetMapping("/resetPasswordAccount")
public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
return userService.resetPassword(type,account,appId);
@@ -1508,8 +1513,13 @@
}
@GetMapping("/myFeedBack")
- public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){
- return userService.myFeedBack(id,type);
+ public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+ return userService.myFeedBack(id,type,propertyId);
+ }
+
+ @GetMapping("/propertyCheck")
+ public R propertyCheck(@RequestParam String phone){
+ return userService.propertyCheck(phone);
}
}
--
Gitblit v1.7.1