diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppBuilderAppServiceImpl.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppBuilderAppServiceImpl.java
index 5bfdd065cb..b10e8ae894 100644
--- a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppBuilderAppServiceImpl.java
+++ b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppBuilderAppServiceImpl.java
@@ -228,6 +228,7 @@ public Rsp<RangedResultSet<AppBuilderAppMetadataDto>> list(AppQueryCondition con
         if (cond == null) {
             cond = new AppQueryCondition();
         }
+        cond.setCreateBy(context.getOperator());
         if (this.isEnableDomainDivision) {
             cond.setUserGroupId(this.domainDivisionService.getUserGroupId());
         }
diff --git a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml
index 1650a996a7..e2736df041 100644
--- a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml
+++ b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml
@@ -123,6 +123,9 @@
                     #{excludeName}
                 </foreach>
             </if>
+            <if test="cond.userGroupId == null and cond.createBy != null">
+                and create_by = #{cond.createBy}
+            </if>
             <if test='cond.userGroupId != null'>
                 and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
             </if>
@@ -202,6 +205,9 @@
         <if test="cond.appCategory != null">
             and app_category = #{cond.appCategory}
         </if>
+        <if test="cond.userGroupId == null and cond.createBy != null">
+            and create_by = #{cond.createBy}
+        </if>
         <if test='cond.userGroupId != null'>
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
diff --git a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml
index 2a16a11ba1..f1fa9f403e 100644
--- a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml
+++ b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml
@@ -99,6 +99,9 @@
         <if test="cond.tenantId != null">
             and tenant_id = #{cond.tenantId}
         </if>
+        <if test="cond.userGroupId == null and cond.createBy != null">
+            and create_by = #{cond.createBy}
+        </if>
         <if test='cond.userGroupId != null'>
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
@@ -129,6 +132,9 @@
         <if test="cond.tenantId != null">
             and tenant_id = #{cond.tenantId}
         </if>
+        <if test="cond.userGroupId == null and cond.createBy != null">
+            and create_by = #{cond.createBy}
+        </if>
         <if test='cond.userGroupId != null'>
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
diff --git a/app-builder/plugins/aipp-plugin/src/main/resources/sql/schema/create_tables/appbuilder_create.sql b/app-builder/plugins/aipp-plugin/src/main/resources/sql/schema/create_tables/appbuilder_create.sql
index 1462505286..6b2aeb9e5b 100644
--- a/app-builder/plugins/aipp-plugin/src/main/resources/sql/schema/create_tables/appbuilder_create.sql
+++ b/app-builder/plugins/aipp-plugin/src/main/resources/sql/schema/create_tables/appbuilder_create.sql
@@ -143,7 +143,7 @@ create table if not exists app_builder_form
     is_deleted int2 DEFAULT 0,
     form_suite_id varchar(64) not null,
     version varchar(64) not null,
-    user_group_id varchar(64) NULL
+    user_group_id varchar(64)
     );
 
 create table if not exists app_builder_form_property
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-app.sql b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-app.sql
index 49548e13ba..77d4c9a1dc 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-app.sql
+++ b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-app.sql
@@ -15,7 +15,7 @@ create table if not exists store_app
     "app_category" varchar(16) default 'chatbot',
     "tool_name"        varchar(256)                          not null,
     "tool_unique_name" varchar(36)                           not null,
-    "user_group_id"    varchar(64)                           not null,
+    "user_group_id"    varchar(64),
     unique("tool_unique_name")
     );
 create index if not exists fast_query_app on store_app ("tool_unique_name");
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin-tool.sql b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin-tool.sql
index 890b5322fd..7fe0f02a5e 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin-tool.sql
+++ b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin-tool.sql
@@ -15,7 +15,7 @@ create table if not exists store_plugin_tool
     "tool_unique_name" varchar(36)                           not null,
     "source"           varchar(16) default ''                not null,
     "icon"             text,
-    "user_group_id"    varchar(64)                           not null,
+    "user_group_id"    varchar(64),
     unique("plugin_id", "tool_unique_name")
 );
 comment on column store_plugin_tool.id is '插件工具的自增主键';
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin.sql b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin.sql
index 6ebd550144..bc37a320fe 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin.sql
+++ b/store/plugins/store-repository-postgresql/src/main/resources/sql/schema/create_tables/schema-plugin.sql
@@ -15,7 +15,7 @@ create table if not exists store_plugin
     "is_builtin"    boolean     default false             not null,
     "source"        varchar(16) default ''                not null,
     "icon"          text,
-    "user_group_id" varchar(64)                           not null,
+    "user_group_id" varchar(64),
     unique ("plugin_id")
 );
 create index if not exists query_plugin ON store_plugin ("is_builtin");