yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 3 months ago
parent
b30ba5e83e
commit
26a1fd94a0
1 changed files with 16 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -472,7 +472,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
formVariables.put("isAdj", i); formVariables.put("isAdj", i);
} }
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
@ -828,12 +827,13 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(","); nextNodeUserSids.append(sid).append(",");
} }
} }
if (StringUtils.isBlank(nextNodeUserSids)) { if (StringUtils.isBlank(nextNodeUserSids)){
return rb.setMsg("下一环节暂无操作人员"); bv.setNextNodeUserSids("");
} }else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring); bv.setNextNodeUserSids(substring);
} }
}
if (baseAccadjApply.getAccadjTypeValue().equals("调出")) { if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
String callInOrgSid = baseAccadjApply.getCallInOrgSid(); String callInOrgSid = baseAccadjApply.getCallInOrgSid();
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@ -852,12 +852,15 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(","); nextNodeUserSids.append(sid).append(",");
} }
} }
if (StringUtils.isBlank(nextNodeUserSids)){
bv.setNextNodeUserSids("");
}else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring); bv.setNextNodeUserSids(substring);
} }
} }
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
@ -920,11 +923,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(","); nextNodeUserSids.append(sid).append(",");
} }
} }
if (StringUtils.isBlank(nextNodeUserSids)) { if (StringUtils.isBlank(nextNodeUserSids)){
return rb.setMsg("下一环节暂无操作人员"); bv.setNextNodeUserSids("");
} }else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring); bv.setNextNodeUserSids(substring);
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) { if (!resultBean1.getSuccess()) {

Write Preview
Loading…
Cancel
Save