Merge remote-tracking branch 'origin/master'

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/MachineControlServiceImpl.java

@@ -77,6 +77,7 @@ public class MachineControlServiceImpl implements MachineControlService {
         map.put("totalSize",totalSize);
         map.put("totalPageNum",(totalSize + pageSize - 1) / pageSize);
         Integer start = (pageNum - 1) * pageSize;
+        if (keyword == null) { keyword = "";}
         List<Map> machineControlInfoList = machineControlRepository.getMachineControlInfo(start, pageSize, keyword);
         map.put("data",machineControlInfoList);
         return map;