diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e04ba6c2fb..0ce5b43c53 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -21,7 +21,6 @@ public enum ProcDefEnum { QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"), //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), - BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"), diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 1d077dd0dd..780ab20c48 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -178,12 +178,19 @@ public class FlowableRest implements FlowableFeign { a.setFlowableRecordVo(stringObjectMap); a.setState(0+""); List taskUserInfos = f.getTaskUserInfos(); - if(taskUserInfos.size() == 1){ - com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0); - if("admin".equals(appUserVo.getAssigneeName())){ - return; + if(taskUserInfos != null){ + taskUserInfos.removeAll(Collections.singleton(null)); + if(!taskUserInfos.isEmpty()){ + if(taskUserInfos.size() == 1){ + com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0); + if("admin".equals(appUserVo.getAssigneeName())){ + return; + } + } } } + + flowList.add(a); }); //评论记录 diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java index 4b7a813600..dab69f14b2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java @@ -16,4 +16,6 @@ public class DeliveredApplyPageQuery implements Query { @ApiModelProperty("用户名称") private String name; + + private String menuSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java index 31cc42091a..0f82080ef3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java @@ -17,6 +17,6 @@ public class DeliveredPageQuery implements Query { @ApiModelProperty("客户名称") private String name; - private String menuSid; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index 679e5c75c7..e2ee36421a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -123,12 +123,19 @@ public class AppService { a.setFlowableRecordVo(f); a.setState(0 + ""); List taskUserInfos = f.getTaskUserInfos(); - if (taskUserInfos.size() == 1) { - AppUserVo appUserVo = taskUserInfos.get(0); - if ("admin".equals(appUserVo.getAssigneeName())) { - return; + if(taskUserInfos != null){ + taskUserInfos.removeAll(Collections.singleton(null)); + if(!taskUserInfos.isEmpty()){ + if (taskUserInfos.size() == 1) { + AppUserVo appUserVo = taskUserInfos.get(0); + if ("admin".equals(appUserVo.getAssigneeName())) { + return; + } + } } } + + list.add(a); });