地籍区字包含判断

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -495,7 +495,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
         List<String> layerFieldNameList = this.getFieldName(layer, haveGeom);
         // 判断是否包含相同的元素（不考虑顺序）
-        boolean areCollectionsEqual = CollectionUtils.isEqualCollection(dbFieldNameList, layerFieldNameList);
+        boolean areCollectionsEqual = CollectionUtils.containsAll(layerFieldNameList,dbFieldNameList);
         if (!areCollectionsEqual) {
             checkInfoList.add(name + ":字段数据不一致！-" + dbFieldNameList);
             fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", name + ":字段数据不一致！-" + dbFieldNameList, "info");
@@ -565,7 +565,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         //这里移除校验字段（非属mdb中的字段）
         dbFieldNameList.remove("valid_flag");
         // 判断是否包含相同的元素（不考虑顺序）
-        boolean areCollectionsEqual = CollectionUtils.isEqualCollection(dbFieldNameList, lowerCaseMdbTableFieldNameList);
+        boolean areCollectionsEqual = CollectionUtils.containsAll(lowerCaseMdbTableFieldNameList,dbFieldNameList);
         if (!areCollectionsEqual) {
             checkInfoList.add(mdbTableName + ":字段数据不一致！-" + dbFieldNameList);
             fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", mdbTableName + ":字段数据不一致！-" + dbFieldNameList, "info");