Эх сурвалжийг харах

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

LHB 1 сар өмнө
parent
commit
ce6b2f55d5

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

@@ -538,7 +538,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 //                                            }
                                             if(CollectionUtil.isNotEmpty(syncPKeyIds)){
                                                 //判断是否展示同步标识
-                                                vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
+                                                vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId().toString()) ? 1 : 0);
                                             }
                                         }
                                         return vo;
@@ -707,7 +707,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 //                                                }
                                                 if(CollectionUtil.isNotEmpty(syncPKeyIds)){
                                                     //判断是否展示同步标识
-                                                    vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
+                                                    vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId().toString()) ? 1 : 0);
                                                 }
                                             }
                                             return vo;