From fd43b4a2a714fcad873a64927474097c18d44e8d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 11 May 2021 09:33:52 +0800
Subject: [PATCH] 更新部门下不能新增岗位员工
---
src/main/java/cn/timer/api/controller/spmk/SpmkController.java | 3 ++-
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
index 1e50a74..35cd857 100644
--- a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+++ b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
@@ -10,6 +10,7 @@ import java.util.Set;
import cn.timer.api.bean.spmk.*;
import cn.timer.api.dao.spmk.*;
import cn.timer.api.dto.spmk.*;
+import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -599,7 +600,7 @@ public class SpmkController {
adm.setRequestData(spmkApproveSummaryDto.getRequestData().toString());
adm.setFroms(spmkApproveSummaryDto.getFroms().toString());
adm.setRouter(listRouter.get(0).toJSONString());
- adm.setFlowChildren(listFlowChildren.toString());
+ adm.setFlowChildren(JSONArray.fromObject(listFlowChildren).toString());
try {
spmkApproveDetailSummaryMapper.insert(adm);
}catch (Exception e){
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 f90e851..3be8baa 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,5 +1,6 @@
package cn.timer.api.controller.spmk.service;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -12,7 +13,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 net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -116,10 +117,7 @@ public class SpmkServiceImpl implements SpmkService{
adD.setRouter(jsonObject.parseObject(ad.getRouter(), Router.class));
}
if(ad.getFlowChildren()!=null) {
- adD.setFlowChildren(jsonObject.parseArray(ad.getFroms(), FlowChildren.class));
- /*List<String> strsToList1= Arrays.asList(ad.getFlowChildren().split("FlowChildren"));
- System.out.println(strsToList1);*/
-
+ adD.setFlowChildren(jsonObject.parseArray(ad.getFlowChildren(), FlowChildren.class));
}
adD.setApproveExecuteRecord(listAer);
if(sum != null) {
--
libgit2 0.26.0