修改导入

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -927,13 +927,13 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
             hlgPaymentDetailList = hlgPaymentDetailList1;
             List<HlgPaymentDetailExport> list1 = new ArrayList<HlgPaymentDetailExport>();
             list1.addAll(hlgPaymentDetailList);
-            Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber));
+            Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.idcardNumber) && StringUtils.isNotBlank(hwPaymentDetailExport2.idcardNumber)?hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber):1);
             set1.addAll(hlgPaymentDetailList);
             list1.removeAll(new ArrayList<>(set1));
 
             List<HlgPaymentDetailExport> list3 = new ArrayList<HlgPaymentDetailExport>();
             list3.addAll(hlgPaymentDetailList);
-            Set<HlgPaymentDetailExport> set2 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> hwPaymentDetailExport1.getCardNumber().compareTo(hwPaymentDetailExport2.getCardNumber()));
+            Set<HlgPaymentDetailExport> set2 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.getCardNumber()) && StringUtils.isNotBlank(hwPaymentDetailExport2.getCardNumber())?hwPaymentDetailExport1.getCardNumber().compareTo(hwPaymentDetailExport2.getCardNumber()):1);
             set2.addAll(hlgPaymentDetailList);
             list3.removeAll(new ArrayList<>(set2));
             list3.removeAll(list1);

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserServiceImpl.java

@@ -141,7 +141,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         if (hlgUserExportList.size() > 0) {
             List<HlgUserExport> list1 = new ArrayList<HlgUserExport>();
             list1.addAll(hlgUserExportList);
-            Set<HlgUserExport> set1 = new TreeSet<HlgUserExport>((hlgUserExport1, hlgUserExport2) -> hlgUserExport1.idcardNumber.compareTo(hlgUserExport2.idcardNumber));
+            Set<HlgUserExport> set1 = new TreeSet<HlgUserExport>((hlgUserExport1, hlgUserExport2) -> StringUtils.isNotBlank(hlgUserExport1.idcardNumber) && StringUtils.isNotBlank(hlgUserExport2.idcardNumber)?hlgUserExport1.idcardNumber.compareTo(hlgUserExport2.idcardNumber):1);
             set1.addAll(hlgUserExportList);
             list1.removeAll(new ArrayList<>(set1));