【丽水】增加queryTaskByCondition空指针异常判断

陈昶聿

16 小时以前 11d763612e5dbcc5d2365683b8c8eb6c5b525653

【丽水】增加queryTaskByCondition空指针异常判断

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -184,6 +184,10 @@
        List<ServiceSubtask> list = selectServiceSubtaskList(serviceSubtaskVO);

        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
        if(ObjectUtils.isEmpty(serviceTask)){
            log.error("找不到对应的serviceTask, orgid：{}, taskid: {}", serviceSubtask.getOrgid(), serviceSubtask.getTaskid());
            return null;
        }
        if (CollectionUtils.isEmpty(list) || list.size() == 0) {
            ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
            ObjectMapper objectMapper = new ObjectMapper();

 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java

@@ -246,6 +246,9 @@
//        }
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        List info = new ArrayList();
        if (serviceTask.getType().equals("1")) {
            //随访
@@ -300,6 +303,9 @@
    public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum) {
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        //通过模板ID获取问题信息
        SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
        svyTaskTemplateScript.setTemplateID(Long.valueOf(serviceTask.getTemplateid()));