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

src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java

@@ -992,8 +992,6 @@ public class XgfUserServiceImpl implements XgfUserService {
 
     @Override
     public void repulse(PageData flows, XgfFlowDto info) throws Exception {
-        // add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端
-        if ("-1".equals(info.getBACK_STEP())){
         PageData condition = new PageData();
         condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
         PageData entity = xgfUserMapper.findById(condition);
@@ -1012,17 +1010,6 @@ public class XgfUserServiceImpl implements XgfUserService {
         xgfUserMapper.edit(entity);
         this.clearInfo(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