[appBuilder] 实现分域功能

Author: wuayee

app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml

@@ -203,7 +203,7 @@
             and app_category = #{cond.appCategory}
         </if>
         <if test='cond.userGroupId != null'>
-            and user_group_id = #{cond.userGroupId}  or user_group_id = '*'
+            and (user_group_id = #{cond.userGroupId}  or user_group_id = '*')
         </if>
         ) as latest_records WHERE <include refid="appTypeCondition"/>;
     </select>

app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml

@@ -100,7 +100,7 @@
             and tenant_id = #{cond.tenantId}
         </if>
         <if test='cond.userGroupId != null'>
-            and user_group_id = #{cond.userGroupId} or user_group_id = '*'
+            and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
         <if test="cond.type != null">
             and type = #{cond.type}
@@ -130,7 +130,7 @@
             and tenant_id = #{cond.tenantId}
         </if>
         <if test='cond.userGroupId != null'>
-            and user_group_id = #{cond.userGroupId} or user_group_id = '*'
+            and (user_group_id = #{cond.userGroupId} or user_group_id = '*')
         </if>
         <if test="cond.type != null">
             and type = #{cond.type}

store/plugins/store-repository-postgresql/src/main/java/modelengine/jade/store/repository/pgsql/service/DefaultPluginService.java

@@ -157,9 +157,15 @@ public List<PluginData> getPlugins(DeployStatus deployStatus) {
     }
 
     private Predicate<PluginData> isNotInUserGroup() {
-        return data -> data.getUserGroupId() != null && (
-                !StringUtils.equals(data.getUserGroupId(), this.domainDivisionService.getUserGroupId())
-                        || !StringUtils.equals(data.getUserGroupId(), "*"));
+        return data -> {
+            if (data.getUserGroupId() == null) {
+                return true;
+            }
+            String currentUserGroupId = this.domainDivisionService.getUserGroupId();
+            boolean isCurrentGroup = StringUtils.equals(data.getUserGroupId(), currentUserGroupId);
+            boolean isAllGroup = StringUtils.equals(data.getUserGroupId(), "*");
+            return !(isCurrentGroup || isAllGroup);
+        };
     }
 
     @Override