diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java index a675995833..414b719dd8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java @@ -82,8 +82,8 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService getSaveInit(String userSid, String orgPath) { @@ -169,7 +169,7 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 ResultBean rb = ResultBean.fireFail(); - //0 上一环节 1下一环节 + + // 获取next值和formVariables int next = query.getNext(); - Map formVariables = query.getFormVariables(); - formVariables = getMap(formVariables, query.getBusinessSid()); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); query.setFormVariables(formVariables); - String data = ""; - if (next == 0) { - ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else if (next == 1) { - ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else { - return rb.setMsg("参数错误:next"); + + // 校验next参数是否有效(只允许0或1) + if (next != 0 && next != 1) { + return rb.setMsg("参数错误:next"); // 如果next不是0或1,返回错误信息 } + + // 获取节点名称 + String data = oaFormService.getNodeName(query, next); + + // 如果data为null,表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 return rb.success().setData(data); } public Map getMap(Map formVariables, String sid) { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java index d3e82d294f..29cba1a7eb 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java @@ -202,32 +202,30 @@ public class AdGroupSystemApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 ResultBean rb = ResultBean.fireFail(); - //0 上一环节 1下一环节 + + // 获取next值和formVariables int next = query.getNext(); - Map formVariables = query.getFormVariables(); - formVariables = getMap(formVariables, query.getBusinessSid()); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); query.setFormVariables(formVariables); - String data = ""; - if (next == 0) { - ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else if (next == 1) { - ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else { - return rb.setMsg("参数错误:next"); + + // 校验next参数是否有效(只允许0或1) + if (next != 0 && next != 1) { + return rb.setMsg("参数错误:next"); // 如果next不是0或1,返回错误信息 } + + // 获取节点名称 + String data = oaFormService.getNodeName(query, next); + + // 如果data为null,表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 return rb.success().setData(data); } public Map getMap(Map formVariables, String sid) { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java index 4eb8b36f98..aac4e9826c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java @@ -64,8 +64,8 @@ public class AdJdPermissionApplyService extends MybatisBaseService getSaveInit(String userSid, String orgPath) { @@ -138,7 +138,7 @@ public class AdJdPermissionApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 ResultBean rb = ResultBean.fireFail(); - //0 上一环节 1下一环节 + + // 获取next值和formVariables int next = query.getNext(); - Map formVariables = query.getFormVariables(); - formVariables = getMap(formVariables, query.getBusinessSid()); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); query.setFormVariables(formVariables); - String data = ""; - if (next == 0) { - ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else if (next == 1) { - ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else { - return rb.setMsg("参数错误:next"); + + // 校验next参数是否有效(只允许0或1) + if (next != 0 && next != 1) { + return rb.setMsg("参数错误:next"); // 如果next不是0或1,返回错误信息 } + + // 获取节点名称 + String data = oaFormService.getNodeName(query, next); + + // 如果data为null,表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 return rb.success().setData(data); } public Map getMap(Map formVariables, String sid) { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java index dabb46309e..b3d3ce704d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java @@ -61,8 +61,8 @@ public class AdPlatformPermissionApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 ResultBean rb = ResultBean.fireFail(); - //0 上一环节 1下一环节 + + // 获取next值和formVariables int next = query.getNext(); - Map formVariables = query.getFormVariables(); - formVariables = getMap(formVariables, query.getBusinessSid()); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); query.setFormVariables(formVariables); - String data = ""; - if (next == 0) { - ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else if (next == 1) { - ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); - if (resultBean.getSuccess()) { - resultBean.getData().removeAll(Collections.singleton(null)); - data = resultBean.getData().get(0).getName(); - } else { - return rb.setMsg(resultBean.getMsg()); - } - } else { - return rb.setMsg("参数错误:next"); + + // 校验next参数是否有效(只允许0或1) + if (next != 0 && next != 1) { + return rb.setMsg("参数错误:next"); // 如果next不是0或1,返回错误信息 } + + // 获取节点名称 + String data = oaFormService.getNodeName(query, next); + + // 如果data为null,表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 return rb.success().setData(data); } public Map getMap(Map formVariables, String sid) {