From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-community/src/main/java/com/java110/community/smo/impl/ActivitiesInnerServiceSMOImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ActivitiesInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ActivitiesInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index aa7a63d..fa34f20
--- a/service-community/src/main/java/com/java110/community/smo/impl/ActivitiesInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ActivitiesInnerServiceSMOImpl.java
@@ -46,17 +46,17 @@
List<ActivitiesDto> activitiess = BeanConvertUtil.covertBeanList(activitiesServiceDaoImpl.getActivitiesInfo(BeanConvertUtil.beanCovertMap(activitiesDto)), ActivitiesDto.class);
- if (activitiess == null || activitiess.size() == 0) {
- return activitiess;
- }
-
- String[] userIds = getUserIds(activitiess);
- //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
- for (ActivitiesDto activities : activitiess) {
- refreshActivities(activities, users);
- }
+// if (activitiess == null || activitiess.size() == 0) {
+// return activitiess;
+// }
+//
+// String[] userIds = getUserIds(activitiess);
+// //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+// List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+//
+// for (ActivitiesDto activities : activitiess) {
+// refreshActivities(activities, users);
+// }
return activitiess;
}
--
Gitblit v1.8.0