1

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -72,7 +72,9 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             }
             //查询车牌及司机id
             Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
-            dataMap.putAll(capacityMap);
+            if(capacityMap != null){
+                dataMap.putAll(capacityMap);
+            }
             System.out.println(dataMap);
         }
         return resMap;

src/main/java/com/steerinfo/dil/util/util.java

@@ -1,5 +1,8 @@
 package com.steerinfo.dil.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author zhangnan
  * @Date 2021/5/26 8:59