文件修改

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -145,15 +145,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         LocalDate localDate = LocalDate.now();
         //add by  hxl  2024-10-25   注释掉从 协议调度授权部门的协议逻辑  ==================begin==================
         boolean flag = sysSwitchConfigService.xysqDisplaySwitches();
-        List<PtlAgreementInsCompanyDto> agreementCompany =new ArrayList<>();
-        if(flag){
+        List<PtlAgreementInsCompanyDto> agreementCompany = new ArrayList<>();
+        if (flag) {
             //新逻辑从协议组授权获取
-            if(StringUtils.isNotBlank(deptId)){
+            if (StringUtils.isNotBlank(deptId)) {
                 DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 String dateNow = localDate.format(df);
-                agreementCompany =ptlAgreementGroupLinkDeptMapper.getAgreementCompany(dateNow, deptId);
+                agreementCompany = ptlAgreementGroupLinkDeptMapper.getAgreementCompany(dateNow, deptId);
             }
-        }else{
+        } else {
             //原先逻辑
             agreementCompany = baseMapper.getAgreementCompany(localDate, deptId);
         }
@@ -573,8 +573,11 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             agreeMap = deptList.stream().collect(Collectors.toMap(PtlAgreementDept::getAgreementId, PtlAgreementDept::getDeptId));
         }
         Page<PtlAgreement> agreementPage = page(page, wrapper);
-        List<String> feeFileIds = agreementPage.getRecords().stream().map(m -> m.getFeeFileId()).filter(Objects::nonNull).collect(Collectors.toList());
-        List<InsUploadFiles> insUploadFiles = insUploadFilesService.listByIds(feeFileIds);
+        List<String> feeFileIds = agreementPage.getRecords().stream().map(PtlAgreement::getFeeFileId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<InsUploadFiles> insUploadFiles = new ArrayList<>();
+        if (!feeFileIds.isEmpty()) {
+            insUploadFiles = insUploadFilesService.listByIds(feeFileIds);
+        }
 
         for (PtlAgreement agreement : agreementPage.getRecords()) {
             insUploadFiles.stream()