DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 管理员上传报异常， 普通用户上传，审核时报异常

Browse Source
This commit is contained in:
bupengxiang
2023-05-18 20:10:46 +08:00
parent ee55ec05d0
commit 40d6720216
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class ReportManageConroller {
return Result.error("报告名称已流程中存在"); return Result.error("报告名称已流程中存在");
} }
// 非新增流程 // 非新增流程
if(!"4".equals(vo.getPrcType())){ if( StringUtils.isNotEmpty(vo.getPrcType()) && !"4".equals(vo.getPrcType())){
long count2 = reportDao.selectByReportId(vo.getId()); long count2 = reportDao.selectByReportId(vo.getId());
if (count2==0){ if (count2==0){
return Result.error("报告已经不存在"); return Result.error("报告已经不存在");
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+3 -1
View File
@@ -376,7 +376,9 @@ public class TodoTaskController {
wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId());
BusProcessName one = iBusProcessNameService.getOne(wrapper); BusProcessName one = iBusProcessNameService.getOne(wrapper);
one.setDataId(reportId); 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); iBusProcessNameService.updateById(one);
} }
return WrapMapper.ok(task.getProcessInstanceId()); return WrapMapper.ok(task.getProcessInstanceId());