From 2dfba155bbda18a8495da9d1f7db5c42850c5a4d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 10 Sep 2024 21:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/BaseDataController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java index 54756f0be..2dde67eaa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java @@ -82,9 +82,9 @@ public class BaseDataController { for (int i = 0; i < jsonArray.size(); i++) { JSONObject companyObj = jsonArray.getJSONObject(i); Company company = new Company(); -// company.setCompanySn(companyObj.getString("subcompanycode")); - String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); - company.setCompanySn(uuid); + company.setCompanySn(companyObj.getString("subcompanycode")); +// String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); +// company.setCompanySn(uuid); company.setCompanyName(companyObj.getString("subcompanyname")); company.setExternalId(companyObj.getString("id")); company.setCreateTime(DateUtil.formatDateTime(new Date())); @@ -132,10 +132,10 @@ public class BaseDataController { for (int i = 0; i < jsonArray.size(); i++) { JSONObject companyObj = jsonArray.getJSONObject(i); Company company = new Company(); -// company.setCompanySn(companyObj.getString("departmentcode")); + company.setCompanySn(companyObj.getString("departmentcode")); company.setCompanyName(companyObj.getString("departmentname")); - String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); - company.setCompanySn(uuid); +// String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); +// company.setCompanySn(uuid); company.setExternalId(companyObj.getString("id")); company.setCreateTime(DateUtil.formatDateTime(new Date())); company.setCompanyType(4);