guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into dev

liujun0703-新项目开发
liujun 2024-06-20 16:45:39 +08:00
parent 742295fd29 6d9a283acc
commit 064b6bdc33
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -992,8 +992,6 @@ public class XgfUserServiceImpl implements XgfUserService {
@Override @Override
public void repulse(PageData flows, XgfFlowDto info) throws Exception { public void repulse(PageData flows, XgfFlowDto info) throws Exception {
// add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端
if ("-1".equals(info.getBACK_STEP())){
PageData condition = new PageData(); PageData condition = new PageData();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
@ -1012,17 +1010,6 @@ public class XgfUserServiceImpl implements XgfUserService {
xgfUserMapper.edit(entity); xgfUserMapper.edit(entity);
this.clearInfo(flows); this.clearInfo(flows);
xgfFlowsMapper.edit(flows); xgfFlowsMapper.edit(flows);
} else {
// 1、判断不能自己打回到自己
PageData condition = new PageData();
condition.put("FLOWS_ID",flows.getString("FLOWS_ID"));
PageData flowEntity = xgfFlowsMapper.findById(condition);
if (flowEntity != null && flowEntity.size() > 0 && flowEntity.getString("FLOWS_STEP").equals(info.getBACK_STEP())){
throw new RuntimeException("不能自己打回到自己");
}
flowEntity.put("FLOWS_STEP", info.getBACK_STEP());
xgfFlowsMapper.edit(flowEntity);
}
} }
@Override @Override