Merge branch 'refs/heads/feature-sync-lihb-20250813' into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -508,7 +508,6 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                             List<WbsTreeContractStatistics> wbsTreeContractStatisticsList = jdbcTemplate.query("select id, leaf_num, fill_num, approve_num, complete_num,jl_fill_num, jl_approve_num, jl_complete_num from m_wbs_tree_contract_statistics where id in (" + pKeyIds + ")",
                                     new BeanPropertyRowMapper<>(WbsTreeContractStatistics.class));
                             Map<Long, WbsTreeContractStatistics> wbsTreeContractStatisticsMap = wbsTreeContractStatisticsList.stream().collect(Collectors.toMap(WbsTreeContractStatistics::getId, item -> item));
-                            List<String> finalStrings = strings;
                             List<WbsTreeContractTreeAllVO> wbsTreeContractTreeAllVOS = wbsTreeContractList.stream()
                                     .map(node -> {
                                         WbsTreeContractTreeAllVO vo = BeanUtil.copyProperties(node, WbsTreeContractTreeAllVO.class);
@@ -537,9 +536,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 //                                                    vo.setColorStatus(lowestNode.getColorStatus());
 //                                                }
 //                                            }
-                                            if(CollectionUtil.isNotEmpty(finalStrings)){
+                                            if(CollectionUtil.isNotEmpty(syncPKeyIds)){
                                                 //判断是否展示同步标识
-                                                vo.setIsSync(finalStrings.contains(vo.getPrimaryKeyId()) ? 1 : 0);
+                                                vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
                                             }
                                         }
                                         return vo;
@@ -674,7 +673,6 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 //                                        countMap.put(key, 1L);
 //                                    }
 //                                }
-                                List<String> finalStrings = strings;
                                 String pKeyIds = wbsTreeContractList.stream().map(item -> item.getPKeyId() + "").collect(Collectors.joining(","));
                                 List<WbsTreeContractStatistics> wbsTreeContractStatisticsList = jdbcTemplate.query("select id, leaf_num, fill_num, approve_num, complete_num,jl_fill_num, jl_approve_num, jl_complete_num from m_wbs_tree_contract_statistics where id in (" + pKeyIds + ")",
                                         new BeanPropertyRowMapper<>(WbsTreeContractStatistics.class));
@@ -707,9 +705,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 //                                                        vo.setColorStatus(lowestNode.getColorStatus());
 //                                                    }
 //                                                }
-                                                if(CollectionUtil.isNotEmpty(finalStrings)){
+                                                if(CollectionUtil.isNotEmpty(syncPKeyIds)){
                                                     //判断是否展示同步标识
-                                                    vo.setIsSync(finalStrings.contains(vo.getPrimaryKeyId()) ? 1 : 0);
+                                                    vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
                                                 }
                                             }
                                             return vo;