Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/controller/mobile/ProTaskMobController.java

@@ -152,12 +152,14 @@ public class ProTaskMobController extends BaseController {
         ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proWorkorder.getProductionSolutionId());
         if(proProductionSolution != null && StringUtils.isNotEmpty(proProductionSolution.getFilePath())){
             List<Map<String,Object>> fileMap = (List<Map<String, Object>>) JSONArray.parse(proProductionSolution.getFilePath());
-            for (Map<String,Object> map : fileMap){
-                ProTaskLinkFile file = new ProTaskLinkFile();
-                file.setFileName((String) map.get("originalFilename"));
-                file.setFileType("通用图纸");
-                file.setFilePath((String) map.get("filePath"));
-                list.add(file);
+            if(fileMap != null){
+                for (Map<String,Object> map : fileMap){
+                    ProTaskLinkFile file = new ProTaskLinkFile();
+                    file.setFileName((String) map.get("originalFilename"));
+                    file.setFileType("通用图纸");
+                    file.setFilePath((String) map.get("filePath"));
+                    list.add(file);
+                }
             }
         }
         return AjaxResult.success(list);