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

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

@@ -333,6 +333,8 @@ public class JobServiceImpl extends Service implements JobService {
         int insertCount = getJobMapper().insertIgnoreNull(jobPO);
         params.put("job_no", jobPO.getJobNo());
         params.put("is_key", jobPO.getIsKey());
+        DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(jobPO.getParentDept());
+        params.put("parent_comp",departmentPO.getParentComp());
 
         getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", jobPO.getId());
         if (null != jobPO.getSchemeId()) {
@@ -360,6 +362,8 @@ public class JobServiceImpl extends Service implements JobService {
         int updateCount = 0;
         // 更新主表数据
         params.put("is_key", searchParam.getIsKey());
+        DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
+        params.put("parent_comp",departmentPO.getParentComp());
         updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId());
 
         // 更新主表拓展表
@@ -406,10 +410,7 @@ public class JobServiceImpl extends Service implements JobService {
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
-        Collection<Long> deleteIds = new ArrayList<>();
-        // 递归删除子节点
-        getChildIds(ids, deleteIds);
-        return getJobMapper().deleteByIds(deleteIds);
+        return getJobMapper().deleteByIds(ids);
     }
 
     @Override