Merge remote-tracking branch 'origin/master' into master

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.xml

@@ -110,6 +110,7 @@
         is_deleted = 0
         and wbs_node_id = #{vo.wbsNodeId}
         and contract_id = #{vo.contractId}
+        and pdf_url is not null
         <if test="vo.queryValue != null and vo.queryValue != ''">
             and
             (
@@ -135,6 +136,7 @@
         is_deleted = 0
         and wbs_node_id = #{vo.wbsNodeId}
         and contract_id = #{vo.contractId}
+        and pdf_url is not null
         <if test="vo.queryValue != null and vo.queryValue != ''">
             and
             (

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -95,15 +95,15 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
             return Condition.getPage(query);
         }
         //有数据，转换成VO
-        List<ContractLogVO> voResult = JSONArray.parseArray(JSONObject.toJSONString(result), ContractLogVO.class);
-        List<ContractLogVO> deduplicatedList = new ArrayList<>(voResult.stream()
-                .filter(vo -> vo.getPdfUrl() != null && !vo.getPdfUrl().isEmpty())
-                .collect(Collectors.toMap(
-                        vo -> vo.getPdfUrl() + vo.getCreateUserName(), //根据pdf、创建人去重
-                        vo -> vo,
-                        (existing, replacement) -> existing
-                ))
-                .values());
+        List<ContractLogVO> deduplicatedList = JSONArray.parseArray(JSONObject.toJSONString(result), ContractLogVO.class);
+//        List<ContractLogVO> deduplicatedList = new ArrayList<>(voResult.stream()
+//                .filter(vo -> vo.getPdfUrl() != null && !vo.getPdfUrl().isEmpty())
+//                .collect(Collectors.toMap(
+//                        vo -> vo.getPdfUrl() + vo.getCreateUserName(), //根据pdf、创建人去重
+//                        vo -> vo,
+//                        (existing, replacement) -> existing
+//                ))
+//                .values());
         deduplicatedList.sort(Comparator.comparing(ContractLogVO::getRecordTime).reversed());
         deduplicatedList.forEach(vo -> {
             vo.setName(vo.getFileName());

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -141,9 +141,9 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         if (StringUtils.isNotEmpty(node.getNodeName())) {
             wrappers.set(WbsTreeContract::getFullName, node.getNodeName());
         }
-        if (StringUtils.isNotEmpty(node.getPartitionCode())) {
+//        if (StringUtils.isNotEmpty(node.getPartitionCode())) {
             wrappers.set(WbsTreeContract::getPartitionCode, node.getPartitionCode());
-        }
+//        }
         if (StringUtils.isNotEmpty(node.getSort()) && CommonUtil.checkBigDecimal(node.getSort())) {
             wrappers.set(WbsTreeContract::getSort, node.getSort());
         }