Merge branch 'refs/heads/feature-lihb-20250610' into test-merge-02

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.xml

@@ -258,7 +258,7 @@
           </if>
           AND a.is_deleted = 0
         GROUP BY
-            a.private_id
+            a.group_id,a.private_id
     </select>
 
     <select id="findByPrivateGroupJoinLeftId" resultType="org.springblade.business.vo.StandardElementVo">
@@ -286,11 +286,11 @@
 
     <select id="effectPreview" resultMap="BaseResultElementJoin">
         SELECT
-            a.*, concat(a.symbol,a.name) symbolName,c.group_id group_id
+            a.*, concat(a.symbol,a.name) symbolName,null group_id
         FROM
             u_standard_info a
                 INNER JOIN u_standard_info_join b ON a.id = b.standard_info_left_id
-                INNER JOIN u_standard_info_private_join c ON a.id = c.standard_info_id
+                LEFT JOIN u_standard_info_private_join c ON a.id = c.standard_info_id
 
                 AND a.is_deleted = b.is_deleted
         WHERE
@@ -300,6 +300,6 @@
                 #{item}
             </foreach>
         GROUP BY
-            c.group_id,b.standard_info_left_id
+            b.standard_info_left_id
     </select>
 </mapper>