From ad760018c31427962b8290ae339a4541ab18d06e Mon Sep 17 00:00:00 2001
From: hekaiyu <13673834656@163.com>
Date: Fri, 12 Dec 2025 16:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataSource/controller/StasDataSourceController.java    | 2 +-
 .../dataSource/service/impl/StasDataSourceServiceImpl.java | 7 ++++++-
 .../service/impl/StasSyncStrategyServiceImpl.java          | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java b/jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java
index 2a60d14..8ab9e21 100644
--- a/jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java
+++ b/jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java
@@ -100,7 +100,7 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 	@GetMapping(value = "/targetUser")
 	public Result<?> queryTargetUserList(@RequestParam(name="taskId",required=false) String taskId) {
 		StasTaskConfig taskConfig = stasTaskConfigService.getById(taskId);
-		List<String> tableNameList= stasDataSourceService.queryUserList(taskConfig.getSourceId());
+		List<String> tableNameList= stasDataSourceService.queryUserList(taskConfig.getTargetId());
 		if (tableNameList != null && !"".equals(tableNameList)){
 			return Result.OK(tableNameList);
 		}
diff --git a/jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java b/jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java
index f433e02..0fb6357 100644
--- a/jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java
+++ b/jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java
@@ -87,7 +87,12 @@ public class StasDataSourceServiceImpl extends ServiceImpl<StasDataSourceMapper,
         if(SourceDataTypeEnum.ORACLE.getKey() == stasDataSource.getType()){
             return queryDatabaseMetadata(stasDataSource, "SELECT username FROM ALL_USERS", "username");
         } else {
-            return queryDatabaseMetadata(stasDataSource, "SELECT datname AS username FROM pg_database WHERE datistemplate = false ORDER BY datname;", "username");
+            return queryDatabaseMetadata(stasDataSource,
+                    "SELECT schema_name username \n" +
+                    "FROM information_schema.schemata\n" +
+                    "WHERE schema_name NOT IN ('pg_catalog', 'information_schema')\n" +
+                    "AND schema_name NOT LIKE 'pg_toast%'\n" +
+                    "AND schema_name NOT LIKE 'pg_temp%'", "username");
         }
     }
 
diff --git a/jeecg-module-sync/src/main/java/org/jeecg/stasSyncStrategy/service/impl/StasSyncStrategyServiceImpl.java b/jeecg-module-sync/src/main/java/org/jeecg/stasSyncStrategy/service/impl/StasSyncStrategyServiceImpl.java
index 7ccb17e..515eed1 100644
--- a/jeecg-module-sync/src/main/java/org/jeecg/stasSyncStrategy/service/impl/StasSyncStrategyServiceImpl.java
+++ b/jeecg-module-sync/src/main/java/org/jeecg/stasSyncStrategy/service/impl/StasSyncStrategyServiceImpl.java
@@ -257,8 +257,8 @@ public class StasSyncStrategyServiceImpl extends ServiceImpl<StasSyncStrategyMap
                                                           String targetOwner, String tableName) throws SQLException {
         StringBuilder sqlBuilder = new StringBuilder();
         //模式名称
-//        sqlBuilder.append("CREATE TABLE \"").append(targetOwner).append("\".\"").append(tableName).append("\" (\n");
-        sqlBuilder.append("CREATE TABLE \"").append(tableName).append("\" (\n");
+        sqlBuilder.append("CREATE TABLE \"").append(targetOwner).append("\".\"").append(tableName).append("\" (\n");
+//        sqlBuilder.append("CREATE TABLE \"").append(tableName).append("\" (\n");
 
         // 获取列信息
         String columnSql = "SELECT column_name, data_type, data_length, data_precision, data_scale, nullable " +