Skip to content

8
8timerapiv200
Commit 7e459d59 by Your Name
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
parents fd43b4a2 2c2eb920
Showing with 1 additions and 2 deletions
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
package cn.timer.api.controller.spmk.service; package cn.timer.api.controller.spmk.service;
import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -13,7 +12,6 @@ import cn.timer.api.dao.spmk.*; ...@@ -13,7 +12,6 @@ import cn.timer.api.dao.spmk.*;
import cn.timer.api.dto.spmk.FlowChildren; import cn.timer.api.dto.spmk.FlowChildren;
import cn.timer.api.dto.spmk.Router; import cn.timer.api.dto.spmk.Router;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -118,6 +116,7 @@ public class SpmkServiceImpl implements SpmkService{ ...@@ -118,6 +116,7 @@ public class SpmkServiceImpl implements SpmkService{
} }
if(ad.getFlowChildren()!=null) { if(ad.getFlowChildren()!=null) {
adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(), FlowChildren.class)); adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(), FlowChildren.class));
} }
adD.setApproveExecuteRecord(listAer); adD.setApproveExecuteRecord(listAer);
if(sum != null) { if(sum != null) {
......
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