Pre Merge pull request !141 from reset/feature/cl

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<JobPO> 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);
             }
         }

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -157,6 +157,20 @@ public class GradeServiceImpl extends Service implements GradeService {
             BrowserBean levelBrowserBean = levelBrowserItem.getBrowserConditionParam();
             List<Map<String, Object>> levelMaps = getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(gradePO.getLevelId()).build().getIds());
             levelBrowserBean.setReplaceDatas(levelMaps);
+            long l = System.currentTimeMillis();
+            Map<String, Object> completeParams = levelBrowserBean.getCompleteParams();
+            completeParams.put("currenttime", l);
+            completeParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            Map<String, Object> conditionDataParams = levelBrowserBean.getConditionDataParams();
+            conditionDataParams.put("currenttime", l);
+            conditionDataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            Map<String, Object> dataParams = levelBrowserBean.getDataParams();
+            dataParams.put("currenttime", l);
+            dataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            Map<String, Object> destDataParams = levelBrowserBean.getDestDataParams();
+            destDataParams.put("currenttime", l);
+            destDataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+
             levelBrowserItem.setBrowserConditionParam(levelBrowserBean);
 
             levelBrowserItem.setRelatekey("schemeId");