From 4da34bfc20a06655859acc4c6fc668df45583a1f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 11 May 2021 08:52:32 +0800
Subject: [PATCH] 更新部门下不能新增岗位员工
---
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
index 67ab002..f90e851 100644
--- a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+++ b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
@@ -1,6 +1,7 @@
package cn.timer.api.controller.spmk.service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@@ -11,6 +12,7 @@ import cn.timer.api.dao.spmk.*;
import cn.timer.api.dto.spmk.FlowChildren;
import cn.timer.api.dto.spmk.Router;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -103,7 +105,7 @@ public class SpmkServiceImpl implements SpmkService{
return null;
}
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) {
adD.setRequestData(jsonObject.parseObject(ad.getRequestData(), JSONObject.class));
}
@@ -114,7 +116,10 @@ public class SpmkServiceImpl implements SpmkService{
adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class));
}
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);
if(sum != null) {
--
libgit2 0.26.0