From 555f762284195c021783e496d2fcf9303533cd88 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期二, 30 七月 2024 17:58:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 ae7136b..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
@@ -807,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);
}
--
Gitblit v1.7.1