diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 0e89344..4ffa9b5 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -153,7 +153,7 @@ public class ReportManageConroller { return Result.error("报告名称已流程中存在"); } // 非新增流程 - if(!"4".equals(vo.getPrcType())){ + if( StringUtils.isNotEmpty(vo.getPrcType()) && !"4".equals(vo.getPrcType())){ long count2 = reportDao.selectByReportId(vo.getId()); if (count2==0){ return Result.error("报告已经不存在"); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 773e41c..33ae058 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -376,7 +376,9 @@ public class TodoTaskController { wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); BusProcessName one = iBusProcessNameService.getOne(wrapper); one.setDataId(reportId); - one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + if (!StringUtils.isBlank(dataJson)){ + one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + } iBusProcessNameService.updateById(one); } return WrapMapper.ok(task.getProcessInstanceId());