|
@@ -184,6 +184,9 @@ public class CommonUserController {
|
|
*/
|
|
*/
|
|
@GetMapping("/getHis")
|
|
@GetMapping("/getHis")
|
|
public List<NewWorkflowStep> getHis(String businessKey, String workflowId, String branch) throws ServiceException {
|
|
public List<NewWorkflowStep> getHis(String businessKey, String workflowId, String branch) throws ServiceException {
|
|
|
|
+ if(!"洮南市二龙乡瀚城农产品有限公司".equals(branch)){
|
|
|
|
+ branch = "zt";
|
|
|
|
+ }
|
|
List<WorkflowHistoricTask> workflowHistoricTasks = workflowHistoryService.getInstanceHistories(businessKey);
|
|
List<WorkflowHistoricTask> workflowHistoricTasks = workflowHistoryService.getInstanceHistories(businessKey);
|
|
if(!CollectionUtils.isEmpty(workflowHistoricTasks)){
|
|
if(!CollectionUtils.isEmpty(workflowHistoricTasks)){
|
|
List<WorkflowHistoricTask> workflowHistoricTasks1 = new ArrayList<>(workflowHistoricTasks);
|
|
List<WorkflowHistoricTask> workflowHistoricTasks1 = new ArrayList<>(workflowHistoricTasks);
|