From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 5c4f4f1..025109d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -1,7 +1,9 @@
package com.panzhihua.service_community.service.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -223,8 +225,8 @@
* @return 社区列表
*/
@Override
- public R getCommunityLists() {
- return R.ok(this.comActDAO.getCommunityLists());
+ public R getCommunityLists(String appId) {
+ return R.ok(this.comActDAO.getCommunityLists(appId));
}
@Override
@@ -250,8 +252,8 @@
street.setCount(communityList.size());
}
});
-// streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
-// .collect(Collectors.toList());
+ streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
+ .collect(Collectors.toList());
return R.ok(streetList);
}
@@ -290,4 +292,7 @@
return R.ok(comActPasswordVo);
}
+ public R selectIds(Long id){
+ return R.ok(this.comActDAO.selectIds(id));
+ }
}
--
Gitblit v1.7.1