|
@@ -766,7 +766,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
public List<Map<String, String>> getAllArchiveAgeByContractType(Long projectId) {
|
|
|
List<Map<String, String>> list = baseMapper.getAllArchiveAgeByContractType(projectId);
|
|
|
return list;
|
|
|
- }
|
|
|
+}
|
|
|
|
|
|
@Override
|
|
|
public void splitArchvies(Long projectId, Long contractId, Long nodeId) {
|
|
@@ -3121,7 +3121,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
for (ArchiveTreeContract contract : archiveTreeContracts) {
|
|
|
boolean isContractValid = contractId.toString().equals(contract.getTreeCode()) || contractId.equals(contract.getContractId());
|
|
|
|
|
|
- if (StringUtils.isEmpty(treeCode)) {
|
|
|
+ if (StringUtils.isEmpty(treeCode) || treeCode.equals("S")) {
|
|
|
if (StringUtils.isNotEmpty(nodeId)) {
|
|
|
if (isNodeOrAncestor(contract, nodeId)) {
|
|
|
result.add(contract);
|
|
@@ -3204,7 +3204,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
}
|
|
|
|
|
|
// 根据treeCode决定额外条件
|
|
|
- boolean isOwnerContract = StringUtils.isEmpty(treeCode); // 业主合同段标识
|
|
|
+ boolean isOwnerContract = (StringUtils.isEmpty(treeCode) || treeCode.equals("S")); // 业主合同段标识
|
|
|
boolean passesOwnerCheck = contractId.toString().equals(contract.getTreeCode())
|
|
|
|| contractId.equals(contract.getContractId())
|
|
|
|| StringUtils.isEmpty(contract.getTreeCode());
|