Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -398,8 +398,10 @@ public class PatrolTaskController extends BaseController {
                             patrolTask.setCycleMonth(cycleMonthText);
                         }
                     }
-
-                    String executionTypeText = parseObject.get("executionType").toString();
+                    String executionTypeText = "";
+                    if (parseObject.get("executionType") != null) {
+                        executionTypeText = parseObject.get("executionType").toString();
+                    }
                     if ("2".equals(executionTypeText) || "3".equals(executionTypeText)) {
                         patrolTask.setFixedStartTime(null);
                         patrolTaskService.updatePatrolTaskTime(patrolTask.getTaskId().toString());
@@ -1161,6 +1163,7 @@ public class PatrolTaskController extends BaseController {
                 jsonObjectString = jsonObject.get("taskId").toString();
                 if (StringUtils.isNotEmpty(jsonObjectString)) {
                     patrolTask.setTaskId(Long.valueOf(jsonObjectString));
+                    patrolTask.setTaskCode(patrolTaskService.selectPatrolTaskByTaskId(Long.valueOf(jsonObjectString)).getTaskCode());
                 }
             }