From 6ba2003abdf54ad98a900a3ba6ea934112cc84bc Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 10 Sep 2024 14:30:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/basicdata/controller/BaseDataController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 e0d19264f..54756f0be 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,7 +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"));
+//                    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()));

From 8d20208b490e0f5722839791f5b2e98f0f6250d7 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 10 Sep 2024 17:39:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java
index 6e24af522..44ddae7e4 100644
--- a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java
+++ b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java
@@ -113,6 +113,7 @@ public class JiuzhuDateUtil {
                         .eq(DictionaryItem::getName, xmlx)
                         .eq(DictionaryItem::getDictionaryEncoding, "project_lx"));
                 project.setProjectLx(projectLx.getData());
+                project.setNature(projectObj.getString("xmlxxm").equals("0") ? 1 : 2);
                 projectList.add(project);
             }
             projectService.saveOrUpdateBatch(projectList);