From 6c304e8a81cf4eed6862585d6b22d8fea91c7c99 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 5 Jul 2022 18:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepartmentServiceImpl.java | 5 ++++- .../service/impl/GradeServiceImpl.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 741da437..3010fea3 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -393,7 +393,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService insertCount += getDepartmentMapper().insertIgnoreNull(deptById); if ("1".equals(copyParam.getCopyJob())) { List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(idList.get(i)); - int maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder(); + Integer maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder(); + if (maxJobOrder == null) { + maxJobOrder = 0; + } recursionCopyJob((long) user.getUID(), jobPOS, deptById.getParentComp(), deptById.getId(), maxJobOrder); } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c0008ef9..8b1e6bbc 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -157,6 +157,20 @@ public class GradeServiceImpl extends Service implements GradeService { BrowserBean levelBrowserBean = levelBrowserItem.getBrowserConditionParam(); List> levelMaps = getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(gradePO.getLevelId()).build().getIds()); levelBrowserBean.setReplaceDatas(levelMaps); + long l = System.currentTimeMillis(); + Map completeParams = levelBrowserBean.getCompleteParams(); + completeParams.put("currenttime", l); + completeParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + Map conditionDataParams = levelBrowserBean.getConditionDataParams(); + conditionDataParams.put("currenttime", l); + conditionDataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + Map dataParams = levelBrowserBean.getDataParams(); + dataParams.put("currenttime", l); + dataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + Map destDataParams = levelBrowserBean.getDestDataParams(); + destDataParams.put("currenttime", l); + destDataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + levelBrowserItem.setBrowserConditionParam(levelBrowserBean); levelBrowserItem.setRelatekey("schemeId");