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/unit/impl/UnitBMOImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/unit/impl/UnitBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/unit/impl/UnitBMOImpl.java
index b9637a7..cdbe354 100644
--- a/service-api/src/main/java/com/java110/api/bmo/unit/impl/UnitBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/unit/impl/UnitBMOImpl.java
@@ -4,6 +4,7 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.unit.IUnitBMO;
import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.po.unit.UnitPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
@@ -48,7 +49,8 @@
JSONObject businessUnit = new JSONObject();
businessUnit.put("floorId", paramInJson.getString("floorId"));
businessUnit.put("layerCount", paramInJson.getString("layerCount"));
- businessUnit.put("unitId", !paramInJson.containsKey("unitId") ? "-1" : paramInJson.getString("unitId"));
+ businessUnit.put("unitId", !paramInJson.containsKey("unitId") ? GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_unitId)
+ : paramInJson.getString("unitId"));
businessUnit.put("unitNum", paramInJson.getString("unitNum"));
businessUnit.put("lift", paramInJson.getString("lift"));
businessUnit.put("remark", paramInJson.getString("remark"));
--
Gitblit v1.8.0