Commit efa47952 by Your Name Committed by chenzg

更新部门下不能新增岗位员工

parent 3097b935
package cn.timer.api.controller.spmk.service; package cn.timer.api.controller.spmk.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -11,6 +12,7 @@ import cn.timer.api.dao.spmk.*; ...@@ -11,6 +12,7 @@ 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 com.alibaba.fastjson.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;
...@@ -103,7 +105,7 @@ public class SpmkServiceImpl implements SpmkService{ ...@@ -103,7 +105,7 @@ public class SpmkServiceImpl implements SpmkService{
return null; return null;
} }
List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectListByAsId(asId); List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectListByAsId(asId);
BeanUtil.copyProperties(ad, adD, "requestData","froms","router","spmkApproveExecuteRecord"); BeanUtil.copyProperties(ad, adD, "requestData","froms","router","flowChildren","spmkApproveExecuteRecord");
if(ad.getRequestData() !=null) { if(ad.getRequestData() !=null) {
adD.setRequestData(jsonObject.parseObject(ad.getRequestData(), JSONObject.class)); adD.setRequestData(jsonObject.parseObject(ad.getRequestData(), JSONObject.class));
} }
...@@ -114,7 +116,10 @@ public class SpmkServiceImpl implements SpmkService{ ...@@ -114,7 +116,10 @@ public class SpmkServiceImpl implements SpmkService{
adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class)); adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class));
} }
if(ad.getFlowChildren()!=null) { if(ad.getFlowChildren()!=null) {
adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(), FlowChildren.class)); adD.setFlowChildren(jsonObject.parseArray(ad.getFroms(), FlowChildren.class));
/*List<String> strsToList1= Arrays.asList(ad.getFlowChildren().split("FlowChildren"));
System.out.println(strsToList1);*/
} }
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