From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/org/AddOrgCommunityComponent.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/org/AddOrgCommunityComponent.java b/WebService/src/main/java/com/java110/web/components/org/AddOrgCommunityComponent.java
index 1148b51..fed6582 100644
--- a/WebService/src/main/java/com/java110/web/components/org/AddOrgCommunityComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/org/AddOrgCommunityComponent.java
@@ -7,6 +7,8 @@
import com.java110.web.smo.ICommunityServiceSMO;
import com.java110.web.smo.org.IAddOrgCommunitySMO;
import com.java110.web.smo.org.IAddOrgSMO;
+import com.java110.web.smo.org.IListOrgCommunitysSMO;
+import com.java110.web.smo.org.IListOrgNoCommunitysSMO;
import com.java110.web.smo.org.IListOrgsSMO;
import com.java110.web.smo.org.IListParentOrgsSMO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +25,7 @@
private IAddOrgCommunitySMO addOrgCommunitySMOImpl;
@Autowired
- private IListOrgsSMO listOrgsSMOImpl;
+ private IListOrgNoCommunitysSMO listOrgNoCommunitysSMOImpl;
@Autowired
private IListParentOrgsSMO listParentOrgsSMOImpl;
@@ -40,12 +42,6 @@
return addOrgCommunitySMOImpl.saveOrgCommunity(pd);
}
- public ResponseEntity<String> listEnterCommunitys(IPageData pd) {
-
- return communityServiceSMOImpl.listMyCommunity(pd);
-
- }
-
/**
* 鏌ヨ缁勭粐绠＄悊鍒楄〃
*
@@ -53,7 +49,7 @@
* @return 杩斿洖 ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> list(IPageData pd) {
- return listOrgsSMOImpl.listOrgs(pd);
+ return listOrgNoCommunitysSMOImpl.listOrgNoCommunitys(pd);
}
@@ -69,13 +65,7 @@
this.listParentOrgsSMOImpl = listParentOrgsSMOImpl;
}
- public IListOrgsSMO getListOrgsSMOImpl() {
- return listOrgsSMOImpl;
- }
- public void setListOrgsSMOImpl(IListOrgsSMO listOrgsSMOImpl) {
- this.listOrgsSMOImpl = listOrgsSMOImpl;
- }
public ICommunityServiceSMO getCommunityServiceSMOImpl() {
return communityServiceSMOImpl;
--
Gitblit v1.8.0