Browse Source

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

LHB 2 months ago
parent
commit
ce14b70963

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

@@ -286,7 +286,7 @@
 
 
     <select id="effectPreview" resultMap="BaseResultElementJoin">
     <select id="effectPreview" resultMap="BaseResultElementJoin">
         SELECT
         SELECT
-            a.*
+            a.*, concat(a.symbol,a.name) symbolName,b.group_id
         FROM
         FROM
             u_standard_info a
             u_standard_info a
                 INNER JOIN u_standard_info_join b ON a.id = b.standard_info_left_id
                 INNER JOIN u_standard_info_join b ON a.id = b.standard_info_left_id
@@ -298,6 +298,6 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         GROUP BY
         GROUP BY
-            b.standard_info_left_id
+            b.group_id, b.standard_info_left_id
     </select>
     </select>
 </mapper>
 </mapper>