Commit a0bd4a4b by yuquan.zhu Committed by chenzg

解决审批问题

parent b8326a6e
......@@ -535,14 +535,14 @@ public class SpmkController {
Router router = spmkApproveSummaryDto.getRouter();
List<Router> routers = router.getChildren();
if (CollectionUtil.isNotEmpty(routers)) {
List<Relation> relations = routers.get(0).getRelation();
if (relations == null || relations.size() < 1) {
return ResultUtil.error("无法发起,请完善审批流程");
}
List<User> users = relations.get(0).getUsers();
if (CollectionUtil.isEmpty(users)) {
return ResultUtil.error("无法发起,请完善审批流程");
}
// List<Relation> relations = routers.get(0).getRelation();
// if (relations == null || relations.size() < 1) {
// return ResultUtil.error("无法发起,请完善审批流程");
// }
// List<User> users = relations.get(0).getUsers();
// if (CollectionUtil.isEmpty(users)) {
// return ResultUtil.error("无法发起,请完善审批流程");
// }
}else {
return ResultUtil.error("无法发起,请完善审批流程");
......@@ -560,6 +560,7 @@ public class SpmkController {
System.out.println(listRouter);
List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
System.out.println("listFlowChildren");
System.out.println(listFlowChildren);
// 当前审批人
......
......@@ -368,15 +368,18 @@ public class RouterUtils {
if (listRouter != null && listRouter.size() == 1) {
router = listRouter.get(0);
Relation relation = CollectionUtil.getFirst(router.getRelation());
if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
if (router.getFlow()) {
FlowChildren fc = FlowChildren.builder().build();
BeanUtil.copyProperties(router, fc, "condition","children");
listFlowChildren.add(fc);
getIsFlowChildren(router.getChildren(), listFlowChildren);
}
for (Relation relation : router.getRelation()) {
if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
if (router.getFlow()) {
FlowChildren fc = FlowChildren.builder().build();
BeanUtil.copyProperties(router, fc, "condition","children");
listFlowChildren.add(fc);
getIsFlowChildren(router.getChildren(), listFlowChildren);
}
}
}
// Relation relation = CollectionUtil.getFirst(router.getRelation());
}else if (listRouter != null && listRouter.size() > 1) {
for (Router router2 : listRouter) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment