From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码
---
WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java b/WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java
index ecc6e2c..589c0be 100644
--- a/WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.StateConstant;
+import com.java110.utils.constant.StateConstant;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
-import com.java110.web.smo.community.IAuditCommunitySMO;
+import com.java110.web.smo.community.IAuditEnterCommunitySMO;
import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -26,7 +26,7 @@
private IListAuditEnterCommunitysSMO listAuditEnterCommunitysSMOImpl;
@Autowired
- private IAuditCommunitySMO auditCommunitySMOImpl;
+ private IAuditEnterCommunitySMO auditEnterCommunitySMOImpl;
/**
* 鏌ヨ灏忓尯鍒楄〃
@@ -39,7 +39,7 @@
JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
reqParam.put("auditStatusCd", StateConstant.NO_AUDIT);
- IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getToken(),
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(),
reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());
return listAuditEnterCommunitysSMOImpl.listAuditEnterCommunitys(newPd);
@@ -52,16 +52,15 @@
* @return 杩斿洖 ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> audit(IPageData pd) {
- return auditCommunitySMOImpl.auditCommunity(pd);
+ return auditEnterCommunitySMOImpl.auditEnterCommunity(pd);
}
-
- public IAuditCommunitySMO getAuditCommunitySMOImpl() {
- return auditCommunitySMOImpl;
+ public IAuditEnterCommunitySMO getAuditEnterCommunitySMOImpl() {
+ return auditEnterCommunitySMOImpl;
}
- public void setAuditCommunitySMOImpl(IAuditCommunitySMO auditCommunitySMOImpl) {
- this.auditCommunitySMOImpl = auditCommunitySMOImpl;
+ public void setAuditEnterCommunitySMOImpl(IAuditEnterCommunitySMO auditEnterCommunitySMOImpl) {
+ this.auditEnterCommunitySMOImpl = auditEnterCommunitySMOImpl;
}
public IListAuditEnterCommunitysSMO getListAuditEnterCommunitysSMOImpl() {
--
Gitblit v1.8.0