fix(设备创建) ： 事务回滚

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -2154,7 +2154,7 @@ public class DataDockServiceImpl {
         AgencyUserModel userModel = reginParams.getUserModel();
         CompanyBo company = reginParams.getCompany();
         String orgBranchCode = equipInfo.getString("orgBranchCode");
-        HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(orgBranchCode).getResult();
+        HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[0] : "").getResult();
         // 目前平台返回key为compnay(存在拼写错误)
         CompanyModel parentModel = JSON.parseObject(toJSONString(parentMessage.get("compnay")), CompanyModel.class);
         String equListCode = Objects.toString(equipInfo.get("EQU_LIST"), null);
@@ -2221,7 +2221,7 @@ public class DataDockServiceImpl {
                 .setEndLatitudeLongitude(toJSONString(equipInfo.get("endLatitudeLongitude")))
                 .setEquState(equState)
                 .setEquCode(installationNoticeService.generateEquCode(equListCode, equCategoryCode, equDefineCode, new Date(), _receiveCompanyCode))
-                .setOrgCompanyCode(parentModel.getCompanyCode());
+                .setOrgCompanyCode(Optional.ofNullable(parentModel).map(CompanyModel::getCompanyCode).orElse(null));
     }
 
     /**