diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
index 3092bac938f89df93163cb8ef567c438efa026ab..5cea668b96aaf6ba00f451de0ab3d7b75ded5e08 100644
--- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
@@ -63,7 +63,7 @@ public class OracleColumnSelector extends ColumnSelector {
 
 	@Override
 	protected String getColumnInfoSQL(String tableName) {
-		String owner = this.getGeneratorConfig().getSchemaName();
+		String owner = this.getGeneratorConfig().getUsername().toUpperCase();
 		return String.format(COLUMN_SQL, tableName, owner, tableName, owner);
 	}
 
diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
index 223d36fd18dff480ee2f0c786f6a43ef7b5a86d3..05391c9bb1ad02052d2d7b82b66e8d9de3330941 100644
--- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
@@ -32,7 +32,8 @@ public class OracleTableSelector extends TableSelector {
 		StringBuilder sb = new StringBuilder("");
 		sb.append(" SELECT a.TABLE_NAME as NAME,b.COMMENTS" +
 				"  FROM ALL_TABLES a,USER_TAB_COMMENTS b" +
-				"  WHERE a.TABLE_NAME=b.TABLE_NAME");
+				"  WHERE a.TABLE_NAME=b.TABLE_NAME" +
+				"  AND a.OWNER = SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA')");
 		sb.append(" AND 1=1 ");
 		if(this.getSchTableNames() != null && this.getSchTableNames().size() > 0) {
 			StringBuilder tables = new StringBuilder();