收储调整4

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/StorageServiceImpl.java

@@ -98,7 +98,7 @@ public class StorageServiceImpl {
         }else if(supplyType == 2){
             //这里合并两部分数据
             List<TdgyStatisticsRes> completeList = new ArrayList<>();
-            if(!year.equals("2025")){
+            if(year!=null && !year.equals("2025")){
                 year = null;
             }
             List<TdgyStatisticsRes> sjgdList = gjShijiShouchuMapper.gjShijiShouchuListByYear(year, null, null, null);