From 6ca42bae443095ba78433375688a0b35f674cad5 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 9 Sep 2024 16:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                    | 7 +++----
 .../modules/basicdata/controller/BaseDataController.java   | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7526af59c..3ad970605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,17 +294,16 @@
         </dependency>
 
         <!--mysql-->
-        <dependency>
+     <!--   <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.48</version>
-        </dependency>
-        <!--<dependency>
+        </dependency>-->
+        <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.11</version>
         </dependency>
--->
         <!-- Swagger API文档 -->
         <dependency>
             <groupId>io.springfox</groupId>
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 217ba16a3..e0d19264f 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
@@ -130,8 +130,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);
                     company.setExternalId(companyObj.getString("id"));
                     company.setCreateTime(DateUtil.formatDateTime(new Date()));
                     company.setCompanyType(4);