From 72b44903c7d09fa2480b94597b141415a2534639 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 18 一月 2022 13:24:57 +0800
Subject: [PATCH] Merge branch 'master' into yibin
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index f8adba2..5d78408 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -280,7 +280,7 @@
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
R r1 = partyBuildingService.listActivity(userId, communityId, status);
- if (R.isOk(r1)) {
+ if (R.isOk(r1)&&r1.getData()!=null) {
List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
comActActivityVOS.addAll(data);
}
--
Gitblit v1.7.1