质检-规范管理-条件设置重复判断调整，效果预览查询调整

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

@@ -285,10 +285,12 @@
 
     <select id="effectPreview" resultMap="BaseResultElementJoin">
         SELECT
-            a.*, concat(a.symbol,a.name) symbolName,b.group_id
+            a.*, concat(a.symbol,a.name) symbolName,c.group_id 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
+
                 AND a.is_deleted = b.is_deleted
         WHERE
             a.is_deleted = 0
@@ -297,6 +299,6 @@
                 #{item}
             </foreach>
         GROUP BY
-            b.group_id, b.standard_info_left_id
+            c.group_id,b.standard_info_left_id
     </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoServiceImpl.java

@@ -204,6 +204,8 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
                 //新的数据排序后组合成字符串
                 List<Long> newRightIds = standardInfoJoinDTO.getRightIds();
                 Collections.sort(newRightIds);
+                //把左Id加进来 确保只有在左id相同的情况下才进行判断
+                newRightIds.add(leftId);
                 String newRightIdsStr = String.join(",", newRightIds.stream().map(String::valueOf).collect(Collectors.toList()));
                 newGroupRightIds.add(newRightIdsStr);
             }