|
@@ -3211,7 +3211,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
|
|
|
if (isOwnerContract) {
|
|
|
// 业主合同段:仅需额外检查(nodeId为空时)
|
|
|
- if (passesOwnerCheck) {
|
|
|
+ if (true) {
|
|
|
result.add(contract);
|
|
|
}
|
|
|
} else {
|
|
@@ -5025,6 +5025,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
// 多个组的进行合并组操作
|
|
|
List<List<ArchiveFile>> nodeGroups = new ArrayList<>(nodeGroupMap.values());
|
|
|
List<List<ArchiveFile>> mergedGroups = new ArrayList<>();
|
|
|
+ List<Integer> mergedGroupsPageCount = new ArrayList<>();
|
|
|
|
|
|
int i = 0;
|
|
|
while (i < nodeGroups.size()) {
|
|
@@ -5034,6 +5035,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
// 如果第一组页数和大于350,则第一组不合并
|
|
|
if (currentPages > 350) {
|
|
|
mergedGroups.add(currentMergedGroup);
|
|
|
+ mergedGroupsPageCount.add(currentPages);
|
|
|
i++;
|
|
|
continue;
|
|
|
}
|
|
@@ -5056,6 +5058,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
}
|
|
|
|
|
|
mergedGroups.add(currentMergedGroup);
|
|
|
+ mergedGroupsPageCount.add(currentPages);
|
|
|
i = j; // 从下一个未处理的组继续
|
|
|
}
|
|
|
|