java110
2022-05-26 bdcb64f0293f27e2dfb3de12a60f6e8412cb962b
service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
@@ -140,23 +140,18 @@
                    if (FlowUtil.isCondition(outgoingFlow.getConditionExpression(), vars)) {
                        isReturn = true;
                    }
                    if (!isReturn) {
                        String assignee = ((UserTask) targetFlowElement).getAssignee();
                        if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < 0) {
                            taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
                        }
                        if ("${startUserId}".equals(assignee)) {
                            taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
                        }
                        if ("${nextUserId}".equals(assignee)) {
                            taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
                        if (!StringUtil.isEmpty(assignee)) {
                            taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
                        }
                    }
                }
                //如果下一个为 结束节点
                if (targetFlowElement instanceof EndEvent) {
                    //true 获取输出节点名称
                    taskBusinessKeyMap.put(business_key+"_hasEnd", task.getId());
                    taskBusinessKeyMap.put(business_key + "_hasEnd", "1");
                }
            }
@@ -174,8 +169,8 @@
        for (ContractDto tmpContractDto : tmpContractDtos) {
            tmpContractDto.setTaskId(taskBusinessKeyMap.get(tmpContractDto.getContractId()));
            tmpContractDto.setHasAudit(taskBusinessKeyMap.get(tmpContractDto.getContractId()+"_hasAudit"));
            tmpContractDto.setHasEnd(taskBusinessKeyMap.get(tmpContractDto.getContractId()+"_hasEnd"));
            tmpContractDto.setHasAudit(taskBusinessKeyMap.get(tmpContractDto.getContractId() + "_hasAudit"));
            tmpContractDto.setHasEnd(taskBusinessKeyMap.get(tmpContractDto.getContractId() + "_hasEnd"));
        }
        return tmpContractDtos;
    }