From 2fdeb8d7a6dfd910b7fb9556557d0a05a4d555e3 Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Wed, 24 Dec 2025 09:36:26 +0800
Subject: [PATCH 1/6] [app-builder] resolve query limitation of only self-owned
 apps when allGroupUser is enabled

---
 .../fit/jade/aipp/domain/division/aop/GetSourceAspect.java      | 2 ++
 .../src/main/resources/mapper/AppBuilderAppMapper.xml           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java b/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java
index d4080c7104..16ed31ef40 100644
--- a/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java
+++ b/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java
@@ -59,6 +59,8 @@ public void beforeGet(JoinPoint joinPoint) {
         }
         String username = this.getUserName();
         if (this.allGroupUsers != null && this.allGroupUsers.contains(username)) {
+            UserInfo userInfo = this.buildUserInfo(username, "*allGroupUser*");
+            UserInfoHolder.set(userInfo);
             return;
         }
         UserGroup userGroup = this.getUserGroup(username);
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 e2736df041..7679599cb2 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
@@ -126,7 +126,7 @@
             <if test="cond.userGroupId == null and cond.createBy != null">
                 and create_by = #{cond.createBy}
             </if>
-            <if test='cond.userGroupId != null'>
+            <if test="cond.userGroupId != null and cond.userGroupId != '*allGroupUser*'">
                 and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
             </if>
             ORDER BY

From 1e07e896a36d8cd21685be5784eaa9243561ab8f Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Thu, 25 Dec 2025 14:38:18 +0800
Subject: [PATCH 2/6] [app-builder] resolve query limitation of only self-owned
 forms when allGroupUser is enabled

---
 .../src/main/resources/mapper/AppBuilderFormMapper.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f1fa9f403e..db99a26557 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
@@ -102,7 +102,7 @@
         <if test="cond.userGroupId == null and cond.createBy != null">
             and create_by = #{cond.createBy}
         </if>
-        <if test='cond.userGroupId != null'>
+        <if test="cond.userGroupId != null and cond.userGroupId != '*allGroupUser*'">
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
         <if test="cond.type != null">
@@ -135,7 +135,7 @@
         <if test="cond.userGroupId == null and cond.createBy != null">
             and create_by = #{cond.createBy}
         </if>
-        <if test='cond.userGroupId != null'>
+        <if test="cond.userGroupId != null and cond.userGroupId != '*allGroupUser*'">
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
         <if test="cond.type != null">

From 1d195c761239aa92b47cb1128d3c948032308850 Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Fri, 26 Dec 2025 17:59:30 +0800
Subject: [PATCH 3/6] [app-builder] correct plugin query logic in permission
 scenarios

---
 .../resources/mapper/AppBuilderAppMapper.xml  |   2 +-
 .../src/main/resources/mapper/AppMapper.xml   |   4 +-
 .../main/resources/mapper/PluginMapper.xml    | 100 ++++++++++--------
 .../resources/mapper/PluginToolMapper.xml     | 100 ++++++++++--------
 4 files changed, 111 insertions(+), 95 deletions(-)

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 7679599cb2..9abb90da16 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
@@ -208,7 +208,7 @@
         <if test="cond.userGroupId == null and cond.createBy != null">
             and create_by = #{cond.createBy}
         </if>
-        <if test='cond.userGroupId != null'>
+        <if test="cond.userGroupId != null and cond.userGroupId != '*allGroupUser*'">
             and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
         ) as latest_records WHERE <include refid="appTypeCondition"/>;
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml b/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml
index f4947f5cc9..802ec3b775 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml
+++ b/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml
@@ -119,7 +119,7 @@
             <if test="appCategory != null and appCategory != ''">
                 and i."app_category" ilike '%\' || #{appCategory} || '%' ESCAPE '\'
             </if>
-            <if test='userGroupId != null and userGroupId != ""'>
+            <if test='userGroupId != null and userGroupId != "" and userGroupId != "*allGroupUser*"'>
                 and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
             </if>
         </where>
@@ -135,7 +135,7 @@
             <if test="appCategory != null and appCategory != ''">
                 and i."app_category" ilike '%\' || #{appCategory} || '%' ESCAPE '\'
             </if>
-            <if test='userGroupId != null and userGroupId != ""'>
+            <if test='userGroupId != null and userGroupId != "" and userGroupId != "*allGroupUser*"'>
                 and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
             </if>
         </where>
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml
index d878f584b6..0f55080619 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml
+++ b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml
@@ -118,29 +118,33 @@
         from "store_tag" t
         group by t."tool_unique_name") tg on tg."tool_unique_name" = pt."tool_unique_name"
         <where>
-            <if test='isBuiltin != null and isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test='isBuiltin != null and !isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and userGroupId == null">
-                and i."is_builtin" = #{isBuiltin}
-            </if>
-            <if test='isBuiltin == null and userGroupId != null and userGroupId != ""'>
-                and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
-                and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
-                and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and creator == null">
-                and i."is_builtin" = #{isBuiltin}
-            </if>
-            <if test="isBuiltin == null and creator != null and creator != ''">
-                and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+            <if test='userGroupId != null and userGroupId != ""'>
+                <if test='isBuiltin != null and isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test='isBuiltin != null and !isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and userGroupId == '*allGroupUser*'">
+                    and i."is_builtin" = false
+                </if>
+                <if test='isBuiltin == null and userGroupId != "*allGroupUser*"'>
+                    and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+            </if>
+            <if test='userGroupId == null or userGroupId == ""'>
+                <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
+                    and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
+                    and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and creator == null">
+                    and i."is_builtin" = #{isBuiltin}
+                </if>
+                <if test="isBuiltin == null and creator != null and creator != ''">
+                    and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+                </if>
             </if>
             <if test="isDeployed != null and isDeployed">
                 and (i."deploy_status" = 'DEPLOYED' or i."deploy_status" = 'RELEASED')
@@ -156,29 +160,33 @@
     <select id="getPluginsCount" parameterType="modelengine.jade.store.entity.query.PluginQuery">
         <include refid="getCount"/>
         <where>
-            <if test='isBuiltin != null and isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test='isBuiltin != null and !isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and userGroupId == null">
-                and i."is_builtin" = #{isBuiltin}
-            </if>
-            <if test='isBuiltin == null and userGroupId != null and userGroupId != ""'>
-                and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
-                and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
-                and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and creator == null">
-                and i."is_builtin" = #{isBuiltin}
-            </if>
-            <if test="isBuiltin == null and creator != null and creator != ''">
-                and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+            <if test='userGroupId != null and userGroupId != ""'>
+                <if test='isBuiltin != null and isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test='isBuiltin != null and !isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and userGroupId == '*allGroupUser*'">
+                    and i."is_builtin" = false
+                </if>
+                <if test='isBuiltin == null and userGroupId != "*allGroupUser*"'>
+                    and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+            </if>
+            <if test='userGroupId == null or userGroupId == ""'>
+                <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
+                    and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
+                    and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and creator == null">
+                    and i."is_builtin" = #{isBuiltin}
+                </if>
+                <if test="isBuiltin == null and creator != null and creator != ''">
+                    and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+                </if>
             </if>
             <if test="isDeployed != null and isDeployed">
                 and (i."deploy_status" = 'DEPLOYED' or i."deploy_status" = 'RELEASED')
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginToolMapper.xml b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginToolMapper.xml
index d76eb05321..d3b4e9b4ae 100644
--- a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginToolMapper.xml
+++ b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginToolMapper.xml
@@ -136,29 +136,33 @@
             <if test="isDeployed != null and isDeployed">
                 and (p."deploy_status" = 'DEPLOYED' or p."deploy_status" = 'RELEASED')
             </if>
-            <if test='isBuiltin != null and isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (p."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test='isBuiltin != null and !isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (p."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and userGroupId == null">
-                and p."is_builtin" = #{isBuiltin}
-            </if>
-            <if test='isBuiltin == null and userGroupId != null and userGroupId != ""'>
-                and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and isBuiltin and creator != null and creator != '' and userGroupId == null">
-                and (p."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and !isBuiltin and creator != null and creator != '' and userGroupId == null">
-                and (p."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and creator == null and userGroupId == null">
-                and p."is_builtin" = #{isBuiltin}
-            </if>
-            <if test="isBuiltin == null and creator != null and creator != '' and userGroupId == null">
-                and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+            <if test='userGroupId != null and userGroupId != ""'>
+                <if test='isBuiltin != null and isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (p."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test='isBuiltin != null and !isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (p."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and userGroupId == '*allGroupUser*'">
+                    and p."is_builtin" = false
+                </if>
+                <if test='isBuiltin == null and userGroupId != "*allGroupUser*"'>
+                    and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+            </if>
+            <if test='userGroupId == null or userGroupId == ""'>
+                <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
+                    and (p."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
+                    and (p."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and creator == null">
+                    and p."is_builtin" = #{isBuiltin}
+                </if>
+                <if test="isBuiltin == null and creator != null and creator != ''">
+                    and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+                </if>
             </if>
             <include refid="getOrSearchConditions"/>
             <if test="toolName != null and toolName != ''">
@@ -173,29 +177,33 @@
             <if test="isDeployed != null and isDeployed">
                 and (p."deploy_status" = 'DEPLOYED' or p."deploy_status" = 'RELEASED')
             </if>
-            <if test='isBuiltin != null and isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (p."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test='isBuiltin != null and !isBuiltin and userGroupId != null and userGroupId != ""'>
-                and (p."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and userGroupId == null">
-                and p."is_builtin" = #{isBuiltin}
-            </if>
-            <if test='isBuiltin == null and userGroupId != null and userGroupId != ""'>
-                and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
-            </if>
-            <if test="isBuiltin != null and isBuiltin and creator != null and creator != '' and userGroupId == null">
-                and (p."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and !isBuiltin and creator != null and creator != '' and userGroupId == null">
-                and (p."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
-            </if>
-            <if test="isBuiltin != null and creator == null and userGroupId == null">
-                and p."is_builtin" = #{isBuiltin}
-            </if>
-            <if test="isBuiltin == null and creator != null and creator != '' and userGroupId == null">
-                and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+            <if test='userGroupId != null and userGroupId != ""'>
+                <if test='isBuiltin != null and isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (p."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test='isBuiltin != null and !isBuiltin and userGroupId != "*allGroupUser*"'>
+                    and (p."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and userGroupId == '*allGroupUser*'">
+                    and p."is_builtin" = false
+                </if>
+                <if test='isBuiltin == null and userGroupId != "*allGroupUser*"'>
+                    and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*')
+                </if>
+            </if>
+            <if test='userGroupId == null or userGroupId == ""'>
+                <if test="isBuiltin != null and isBuiltin and creator != null and creator != ''">
+                    and (p."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and !isBuiltin and creator != null and creator != ''">
+                    and (p."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\')
+                </if>
+                <if test="isBuiltin != null and creator == null">
+                    and p."is_builtin" = #{isBuiltin}
+                </if>
+                <if test="isBuiltin == null and creator != null and creator != ''">
+                    and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\'
+                </if>
             </if>
             <include refid="getOrSearchConditions"/>
             <if test="toolName != null and toolName != ''">

From 6459271a82adc0dc027e35bcc7c8b229ecbdea36 Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Wed, 24 Dec 2025 09:24:28 +0800
Subject: [PATCH 4/6] [app-builder] support compatibility with empty system
 prompt error scenarios for some LLMs

---
 .../java/modelengine/fit/jober/aipp/fitable/LlmComponent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java
index c224b4e02e..476f76791e 100644
--- a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java
+++ b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java
@@ -91,7 +91,7 @@
 @Component
 public class LlmComponent implements FlowableService {
     private static final Logger log = Logger.get(LlmComponent.class);
-    private static final String SYSTEM_PROMPT = "{{0}}";
+    private static final String SYSTEM_PROMPT = ":{{0}}";
     private static final String PROMPT_TEMPLATE = "{{1}}";
     private static final String AGENT_NODE_ID = "agent";
     private static final String REGEX_MODEL = "statusCode=(\\d+)";

From 5fa2ff629ddde9a14a255fe57a081c4073c4f58a Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Tue, 6 Jan 2026 10:14:12 +0800
Subject: [PATCH 5/6] [app-builder] adapter allGroupUsers case

---
 .../jade/aipp/domain/division/aop/GetSourceAspectTest.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
index 51a78d6843..d0e91dc486 100644
--- a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
+++ b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
@@ -8,6 +8,7 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -97,7 +98,8 @@ void testBeforeGetUserInAllGroupUsers() {
         UserContext context = new UserContext("admin1", "localhost", "en");
         UserContextHolder.apply(context, () -> {
             this.getSourceAspect.beforeGet(this.joinPoint);
-            assertNull(UserInfoHolder.get());
+            assertNotNull(UserInfoHolder.get());
+            assertEquals("*allGroupUser*", UserInfoHolder.get().getUserGroupId());
         });
     }
 

From 3d11c85944f155d92c7021c8be6ca9140d4ed2a3 Mon Sep 17 00:00:00 2001
From: loveTsong <271667068@qq.com>
Date: Tue, 6 Jan 2026 14:53:50 +0800
Subject: [PATCH 6/6] [app-builder] adapter allGroupUsers case

---
 .../fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
index d0e91dc486..685736efb9 100644
--- a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
+++ b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java
@@ -100,6 +100,8 @@ void testBeforeGetUserInAllGroupUsers() {
             this.getSourceAspect.beforeGet(this.joinPoint);
             assertNotNull(UserInfoHolder.get());
             assertEquals("*allGroupUser*", UserInfoHolder.get().getUserGroupId());
+            this.getSourceAspect.afterGet(this.joinPoint);
+            assertNull(UserInfoHolder.get());
         });
     }