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/parkingArea/impl/ParkingAreaBMOImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/parkingArea/impl/ParkingAreaBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/parkingArea/impl/ParkingAreaBMOImpl.java
index 45a7a7f..6c4f7a6 100644
--- a/service-api/src/main/java/com/java110/api/bmo/parkingArea/impl/ParkingAreaBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/parkingArea/impl/ParkingAreaBMOImpl.java
@@ -4,6 +4,7 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.parkingArea.IParkingAreaBMO;
import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.po.parking.ParkingAreaPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.BeanConvertUtil;
@@ -44,9 +45,10 @@
JSONObject businessParkingArea = new JSONObject();
businessParkingArea.putAll(paramInJson);
- businessParkingArea.put("paId", "-1");
+ businessParkingArea.put("paId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_paId));
ParkingAreaPo parkingAreaPo = BeanConvertUtil.covertBean(businessParkingArea, ParkingAreaPo.class);
super.insert(dataFlowContext, parkingAreaPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_PARKING_AREA);
+ paramInJson.put("paId", businessParkingArea.getString("paId"));
}
/**
--
Gitblit v1.8.0