修改 入职申请查询借口,添加部门名称、岗位名称字段
修改 发起流程借口 不查询出入职申请
This commit is contained in:
parent
f057d4310e
commit
a22d3fc41b
@ -47,7 +47,7 @@ public class BpmProcessDefinitionController {
|
|||||||
BpmProcessDefinitionListReqVO listReqVO) {
|
BpmProcessDefinitionListReqVO listReqVO) {
|
||||||
|
|
||||||
List<BpmProcessDefinitionRespVO> respVOS = bpmDefinitionService.getProcessDefinitionList(listReqVO);
|
List<BpmProcessDefinitionRespVO> respVOS = bpmDefinitionService.getProcessDefinitionList(listReqVO);
|
||||||
respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task")).collect(Collectors.toList());
|
respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task") && !data.getId().contains("oa_entry")).collect(Collectors.toList());
|
||||||
return success(respVOS);
|
return success(respVOS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +65,13 @@ public class BpmOAEntryController {
|
|||||||
|
|
||||||
BpmOAEntryDO entry = entryService.getEntry(id);
|
BpmOAEntryDO entry = entryService.getEntry(id);
|
||||||
|
|
||||||
return success(BpmOAEntryConvert.INSTANCE.convert(entry));
|
BpmOAEntryRespVO respVO = BpmOAEntryConvert.INSTANCE.convert(entry);
|
||||||
|
// 设备部门名称
|
||||||
|
respVO.setEntryDeptName(getDept(entry.getEntryDeptId()).getName());
|
||||||
|
// 设备岗位名称
|
||||||
|
respVO.setEntryPostName(getPost(entry.getEntryPostId()).getName());
|
||||||
|
|
||||||
|
return success(respVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/getByOpenId")
|
@GetMapping("/getByOpenId")
|
||||||
|
Loading…
Reference in New Issue
Block a user