From 0a822359bdbc5ef689926164bdf0401f229fec3f Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 28 Sep 2023 11:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/system/service/impl/SysDatasourceServiceImpl.java  | 4 ++--
 op-modules/op-system/src/main/resources/bootstrap.yml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
index f200003d..36ab9138 100644
--- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
+++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
@@ -82,9 +82,9 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
                                +mysqlAffter+sysDatasource.getIpPort().split("/")[1]);
         }
         if(sysDatasource.getDeptId()!=null){
-            if(StringUtils.isNotEmpty(sysDatasource.getSystemType())){
+
                 sysDatasource.setPoolName(poolNamePrev+"_"+sysDatasource.getDeptId());
-            }
+
         }
 
         return sysDatasourceMapper.insertSysDatasource(sysDatasource);
diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml
index fe34e4c4..fee75e91 100644
--- a/op-modules/op-system/src/main/resources/bootstrap.yml
+++ b/op-modules/op-system/src/main/resources/bootstrap.yml
@@ -37,4 +37,4 @@ sqlserve:
   driver: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #数据标识前缀
   poolName:
-    prev: factory
+    prev: ds