From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
index c2fe80a..f1d0d2a 100644
--- a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -520,10 +520,9 @@
paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
paramInJson.put("state", "1000");
paramInJson.put("communityArea", "0");
- paramInJson.put("createTime", new Date());
- paramInJson.put("bId", "-1");
CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
- communityInnerServiceSMOImpl.saveCommunity(communityPo);
+ super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
+
}
/**
@@ -563,7 +562,9 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
- communityInnerServiceSMOImpl.updateCommunity(communityPo);
+
+ super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
}
}
--
Gitblit v1.8.0