fix导入

module_kzks/src/main/java/org/jeecg/modules/projectBudget/service/impl/ProjectBudgetServiceImpl.java

@@ -120,7 +120,7 @@ public class ProjectBudgetServiceImpl extends ServiceImpl<ProjectBudgetMapper, P
                 BigDecimal wxys = countWXYS(budget);//外协预算
                 budget.setWxys(wxys.toString());
 
-                if(!Objects.equals(budget.getTaskNumber(),"")){
+                if(budget.getTaskNumber()!=null && !budget.getTaskNumber().equals("")){
                     //删除原来的项目预算
                     columnMap = new HashMap<>();
                     columnMap.put("task_number",budget.getTaskNumber());

module_kzks/src/main/java/org/jeecg/modules/projectImportList/service/impl/ProjectImportListServiceImpl.java

@@ -97,7 +97,7 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
                 String taskno = chb.getTaskno();
                 String nd = chb.getNd();
                 String kmbh = chb.getKmbh();
-                if(!Objects.equals(taskno,"") && !Objects.equals(nd,"") && !Objects.equals(kmbh,"")){
+                if(taskno!=null && !taskno.equals("") && nd!=null && !nd.equals("") && kmbh!=null && !kmbh.equals("")){
                     String fylb = kmbhService.getByNdAndKmbh(nd, kmbh);//费用类别
                     if(Objects.equals(fylb,"事务费")){
                         swfList.add(CHBConvert.INSTANCE.toSWF(chb));

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/service/impl/KzksProjectKmbhServiceImpl.java

@@ -59,7 +59,7 @@ public class KzksProjectKmbhServiceImpl extends ServiceImpl<KzksProjectKmbhMappe
             List<KzksProjectKmbh> list1 = new ArrayList<>();
             for(KzksProjectKmbh kmbh : list){
                 String fylb = this.getByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo());//费用类别
-                if(!Objects.equals(fylb,"")) kmbhMapper.updateByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo(),kmbh.getMoneyType());
+                if(fylb!=null) kmbhMapper.updateByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo(),kmbh.getMoneyType());
                 else list1.add(kmbh);
             }