diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 39e5b166..f226dd56 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -206,12 +206,19 @@ public class ExtendInfoBO { fieldItem.setViewAttr(2); } } - - // 浏览按钮特殊处理 - if (FieldType.BROWSER.equals(fieldItem.getType())) { - String browserId = SelectOptionParam.getCustomBrowserId(extendInfoPO.getCustomValue()); - BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), browserId).getBrowserConditionParam(); - fieldItem.setBrowserConditionParam(browserConditionParam); + switch (fieldItem.getType()) { + case BROWSER: + String browserId = SelectOptionParam.getCustomBrowserId(extendInfoPO.getCustomValue()); + BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), browserId).getBrowserConditionParam(); + fieldItem.setBrowserConditionParam(browserConditionParam); + break; + case SELECT: + String customValue = Util.null2String(extendInfoPO.getCustomValue()); + List searchConditionOptions = SelectOptionParam.convertJsonToListOption(customValue); + fieldItem.setOptions(searchConditionOptions); + break; + default: + break; } fieldItem.setWidth(width + "%"); diff --git a/src/com/engine/organization/entity/personnelcard/po/CardButtonPO.java b/src/com/engine/organization/entity/personnelcard/po/CardButtonPO.java index d9a8284a..27fc72af 100644 --- a/src/com/engine/organization/entity/personnelcard/po/CardButtonPO.java +++ b/src/com/engine/organization/entity/personnelcard/po/CardButtonPO.java @@ -31,7 +31,7 @@ public class CardButtonPO { private Integer showOrder; - private Integer open; + private Integer openType; private Long creator; diff --git a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml index 6b4f0513..6adfa494 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml @@ -9,7 +9,7 @@ - + @@ -28,7 +28,7 @@ , t.roles , t.sys_default , t.show_order - , t.open + , t.open_type , t.creator , t.delete_type , t.create_time diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index e9ca8e6b..190c707b 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -197,30 +197,30 @@ public class CompServiceImpl extends Service implements CompService { HasRightUtil.hasRight(user, RIGHT_NAME, false); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); - if ("0".equals(groupId)) { - groupId = GROUP_ID.toString(); - } - String oldCompNo = getCompMapper().listById(searchParam.getId()).getCompNo(); - String compNo = searchParam.getCompNo(); - if (!compNo.equals(oldCompNo)) { - compNo = repeatDetermine(compNo); - params.put("comp_no", compNo); - } - // 上级分部 - String ecCompany = Util.null2String(params.get("ec_company")); - if (StringUtils.isNotBlank(ecCompany)) { - Long parent_company = Objects.requireNonNull(EcHrmRelationUtil.getJclCompanyId(ecCompany)).getId(); - // 上级分部不能选择本身 - OrganizationAssert.isFalse(parent_company.equals(searchParam.getId()), "上级分部不能选择本身"); - params.put("parent_company", parent_company); - }else{ - params.put("parent_company", ""); + if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) { + String oldCompNo = getCompMapper().listById(searchParam.getId()).getCompNo(); + String compNo = searchParam.getCompNo(); + if (!compNo.equals(oldCompNo)) { + compNo = repeatDetermine(compNo); + params.put("comp_no", compNo); + } + // 上级分部 + String ecCompany = Util.null2String(params.get("ec_company")); + if (StringUtils.isNotBlank(ecCompany)) { + Long parent_company = Objects.requireNonNull(EcHrmRelationUtil.getJclCompanyId(ecCompany)).getId(); + // 上级分部不能选择本身 + OrganizationAssert.isFalse(parent_company.equals(searchParam.getId()), "上级分部不能选择本身"); + params.put("parent_company", parent_company); + } else { + params.put("parent_company", ""); + } + new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync(); + // 更新主表数据 + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); } - new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync(); - // 更新主表数据 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); + // 更新主表拓展表 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, "", searchParam.getId()); //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_COMPEXT_DT1, params, searchParam.getId()); @@ -237,7 +237,7 @@ public class CompServiceImpl extends Service implements CompService { new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.CANCELED, map).sync(); // 删除拓展表、明细表 MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_compext", id); - MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_compext_dt1", id,null); + MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_compext_dt1", id, null); } return getCompMapper().deleteByIds(ids); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 36fa853b..63036f15 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -281,58 +281,56 @@ public class DepartmentServiceImpl extends Service implements DepartmentService HasRightUtil.hasRight(user, RIGHT_NAME, false); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); - if ("0".equals(groupId)) { - groupId = GROUP_ID.toString(); - } - - DepartmentPO oldDept = getDepartmentMapper().getDeptById(searchParam.getId()); - String deptNo = searchParam.getDeptNo(); - if (!deptNo.equals(oldDept.getDeptNo())) { - deptNo = repeatDetermine(deptNo); - params.put("dept_no", deptNo); - } - // 上级分部 - String ecCompany = Util.null2String(params.get("ec_company")); - if (StringUtils.isNotBlank(ecCompany)) { - CompPO jclCompanyId = EcHrmRelationUtil.getJclCompanyId(ecCompany); - if (null != jclCompanyId) { - params.put("parent_comp", jclCompanyId.getId()); + if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) { + DepartmentPO oldDept = getDepartmentMapper().getDeptById(searchParam.getId()); + String deptNo = searchParam.getDeptNo(); + if (!deptNo.equals(oldDept.getDeptNo())) { + deptNo = repeatDetermine(deptNo); + params.put("dept_no", deptNo); } - } - // 上级部门 - String ecDepartment = Util.null2String(params.get("ec_department")); - if (StringUtils.isNotBlank(ecDepartment)) { - DepartmentPO jclDepartmentId = EcHrmRelationUtil.getJclDepartmentId(ecDepartment); - if (null != jclDepartmentId) { - // 上级部门不能选择本身 - OrganizationAssert.isFalse(jclDepartmentId.getId().equals(searchParam.getId()), "上级部门不能选择本身"); - params.put("parent_dept", jclDepartmentId.getId()); - // 部门不为空，自动指定所属分部 - params.put("parent_comp", jclDepartmentId.getParentComp()); - params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(jclDepartmentId.getParentComp()))); + // 上级分部 + String ecCompany = Util.null2String(params.get("ec_company")); + if (StringUtils.isNotBlank(ecCompany)) { + CompPO jclCompanyId = EcHrmRelationUtil.getJclCompanyId(ecCompany); + if (null != jclCompanyId) { + params.put("parent_comp", jclCompanyId.getId()); + } } + // 上级部门 + String ecDepartment = Util.null2String(params.get("ec_department")); + if (StringUtils.isNotBlank(ecDepartment)) { + DepartmentPO jclDepartmentId = EcHrmRelationUtil.getJclDepartmentId(ecDepartment); + if (null != jclDepartmentId) { + // 上级部门不能选择本身 + OrganizationAssert.isFalse(jclDepartmentId.getId().equals(searchParam.getId()), "上级部门不能选择本身"); + params.put("parent_dept", jclDepartmentId.getId()); + // 部门不为空，自动指定所属分部 + params.put("parent_comp", jclDepartmentId.getParentComp()); + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(jclDepartmentId.getParentComp()))); + } - } else { - params.put("parent_dept", ""); + } else { + params.put("parent_dept", ""); + } + new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, params).sync(); + // 更新主表数据 + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", searchParam.getId()); + + DepartmentPO newDeptById = getDepartmentMapper().getDeptById(searchParam.getId()); + new DepartmentTriggerRunnable(oldDept, newDeptById).run(); + + Long parentComp = StringUtils.isNotEmpty(Util.null2String(params.get("parent_comp"))) ? Long.parseLong(Util.null2String(params.get("parent_comp"))) : null; + // 刷新岗位所属分部 + refreshJobComp(searchParam.getId(), parentComp); + List childList = getDepartmentMapper().getDeptListByPId(searchParam.getId()); + String ecCompanyId = EcHrmRelationUtil.getEcCompanyId(Util.null2String(parentComp)); + forbiddenChildTag(parentComp, ecCompanyId, childList); } - new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, params).sync(); - // 更新主表数据 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", searchParam.getId()); // 更新主表拓展表 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, "", searchParam.getId()); //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_DEPTEXT_DT1, params, searchParam.getId()); - DepartmentPO newDeptById = getDepartmentMapper().getDeptById(searchParam.getId()); - new DepartmentTriggerRunnable(oldDept, newDeptById).run(); - - Long parentComp = StringUtils.isNotEmpty(Util.null2String(params.get("parent_comp"))) ? Long.parseLong(Util.null2String(params.get("parent_comp"))) : null; - // 刷新岗位所属分部 - refreshJobComp(searchParam.getId(), parentComp); - List childList = getDepartmentMapper().getDeptListByPId(searchParam.getId()); - String ecCompanyId = EcHrmRelationUtil.getEcCompanyId(Util.null2String(parentComp)); - forbiddenChildTag(parentComp, ecCompanyId, childList); - return searchParam.getId(); } @@ -642,7 +640,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService updateEcDepartment(departmentPO); getDepartmentMapper().updateBaseDept(departmentPO); // 更新组织架构图 - new DepartmentTriggerRunnable(departmentPO.getId()).run(); + new DepartmentTriggerRunnable(departmentPO.getId()).run(); } // 查询该部门一级岗位、更新岗位所属分部、所属部门 List firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId()); @@ -687,7 +685,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService updateEcDepartment(targetDepartment); getDepartmentMapper().updateBaseDept(targetDepartment); // 更新组织架构图 - new DepartmentTriggerRunnable(oldFParentId,targetDepartment.getId()).run(); + new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run(); return 0; } @@ -730,7 +728,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setEcDepartment(null); // 更新组织架构图 - new DepartmentTriggerRunnable(company.toString(),deptById).run(); + new DepartmentTriggerRunnable(company.toString(), deptById).run(); } else if ("1".equals(moveParam.getMoveType())) { Long department = moveParam.getDepartment(); Long departmentId = Objects.requireNonNull(EcHrmRelationUtil.getJclDepartmentId(Util.null2String(department))).getId(); @@ -749,7 +747,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setEcCompany(parentDepartment.getEcCompany()); // 更新组织架构图 - new DepartmentTriggerRunnable(Integer.toString(100000000+department.intValue()),deptById).run(); + new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run(); } // 更新EC部门 updateEcDepartment(deptById); @@ -847,7 +845,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService Set builderComps = new HashSet<>(); for (CompPO compPO : filterComps) { - buildParentComps(compPO, builderComps,allMaps); + buildParentComps(compPO, builderComps, allMaps); } return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps)); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 467d5e28..003ac311 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -163,7 +163,7 @@ public class ExtServiceImpl extends Service implements ExtService { String ecResourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getEcResourceId(String.valueOf(id)); if (Util.null2String(user.getUID()).equals(ecResourceId)) { infoPOList.removeIf(item -> !"1".equals(Util.null2String(item.getIsModify()))); - }else{ + } else { infoPOList = new ArrayList<>(); } } @@ -195,7 +195,12 @@ public class ExtServiceImpl extends Service implements ExtService { Map resultMap = new HashMap<>(); Set keys = item.keySet(); for (String key : keys) { - resultMap.put(key.toLowerCase(), item.get(key)); + Object o = item.get(key); + if (o instanceof Integer) { + resultMap.put(key.toLowerCase(), Integer.toString((int) o)); + } else { + resultMap.put(key.toLowerCase(), o); + } } resultMap.put("viewAttr", finalCheckRight ? viewAttr : 1); return resultMap; @@ -250,9 +255,6 @@ public class ExtServiceImpl extends Service implements ExtService { value = null; } if (null == value) { - if ("int".equals(collect.get(key).getFieldType())) { - value = null; - } // 兼容sqlServer数据库text字段类型 if ("text".equals(collect.get(key).getFieldType())) { value = ""; @@ -308,9 +310,9 @@ public class ExtServiceImpl extends Service implements ExtService { Map map = new HashMap<>(); for (ExtendInfoPO extendInfoPO : filterS) { if (BROWSER_TYPE.equals(extendInfoPO.getControlType())) { - map.put(extendInfoPO.getFieldName() + "span", params.get(extendInfoPO.getFieldName() + "span_" + i)); + map.put(extendInfoPO.getFieldName() + "span", parseDetailValue(params.get(extendInfoPO.getFieldName() + "span_" + i))); } - map.put(extendInfoPO.getFieldName(), params.get(extendInfoPO.getFieldName() + "_" + i)); + map.put(extendInfoPO.getFieldName(), parseDetailValue(params.get(extendInfoPO.getFieldName() + "_" + i))); } map.put("mainid", id); map.put("group_id", groupId); @@ -322,4 +324,11 @@ public class ExtServiceImpl extends Service implements ExtService { } } } + + private Object parseDetailValue(Object obj) { + if (null == obj || StringUtils.isBlank(Util.null2String(obj))) { + return null; + } + return obj; + } } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 4d2aa903..aca0d806 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -284,34 +284,35 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic public int updateForm(Map params) { Long id = Long.parseLong((String) params.get("id")); String groupId = (String) params.get("viewCondition"); - if ("0".equals(groupId)) { - groupId = GROUP_ID.toString(); - } - // 判断编号是否重复 - String workCode = Util.null2String(params.get("work_code")); - HrmResourcePO resourceById = getResourceMapper().getResourceById(id.toString()); - if (!workCode.equals(resourceById.getWorkCode())) { - workCode = repeatDetermine(workCode); - params.put("work_code", workCode); - } + int updateCount = 0; + if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) { + // 判断编号是否重复 + String workCode = Util.null2String(params.get("work_code")); + HrmResourcePO resourceById = getResourceMapper().getResourceById(id.toString()); + if (!workCode.equals(resourceById.getWorkCode())) { + workCode = repeatDetermine(workCode); + params.put("work_code", workCode); + } - // 完善更新参数 - completeParams(params); + // 完善更新参数 + completeParams(params); - // 更新EC人员,更新成功后，更新聚才林人员表 - Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.RESOURCE, OperateTypeEnum.UPDATE, params).sync(); - String ecResourceId = Util.null2String(syncMap.get("id")); - OrganizationAssert.isTrue(StringUtils.isNotBlank(ecResourceId), Util.null2String(syncMap.get("message"))); + // 更新EC人员,更新成功后，更新聚才林人员表 + Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.RESOURCE, OperateTypeEnum.UPDATE, params).sync(); + String ecResourceId = Util.null2String(syncMap.get("id")); + OrganizationAssert.isTrue(StringUtils.isNotBlank(ecResourceId), Util.null2String(syncMap.get("message"))); - int updateCount = 0; - // 更新主表数据 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", id); - // 更新主表拓展表 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRMEXT, params, groupId, id); + // 更新主表数据 + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", id); + + new HrmResourceTriggerRunnable(id).run(); + } else { + // 更新主表拓展表 + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRMEXT, params, "", id); + } //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_HRMEXT_DT1, params, id); - new HrmResourceTriggerRunnable(id).run(); return updateCount; } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 2e9722fc..ec6ab1d3 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -404,45 +404,45 @@ public class JobServiceImpl extends Service implements JobService { if (StringUtils.isNotBlank(parent_job)) { OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), "上级岗位不能选择本身"); } - if ("0".equals(groupId)) { - groupId = GROUP_ID.toString(); - } - JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId()); - String oldJobNo = oldJobPO.getJobNo(); - String jobNo = searchParam.getJobNo(); - if (!jobNo.equals(oldJobNo)) { - jobNo = repeatDetermine(jobNo); - params.put("job_no", jobNo); - } + if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) { + JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId()); + String oldJobNo = oldJobPO.getJobNo(); + String jobNo = searchParam.getJobNo(); + if (!jobNo.equals(oldJobNo)) { + jobNo = repeatDetermine(jobNo); + params.put("job_no", jobNo); + } - // 更新主表数据 - params.put("is_key", searchParam.getIsKey()); - if (null != searchParam.getParentJob()) { - JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob()); - params.put("parent_dept", parentJob.getParentDept()); - params.put("parent_comp", parentJob.getParentComp()); - params.put("ec_company", parentJob.getEcCompany()); - params.put("ec_department", parentJob.getEcDepartment()); - } else { - Long ecDepartment = searchParam.getEcDepartment(); - DepartmentPO jclDepartment = EcHrmRelationUtil.getJclDepartmentId(Util.null2String(ecDepartment)); - params.put("parent_dept", jclDepartment.getId()); - params.put("parent_comp", jclDepartment.getParentComp()); - if (null != jclDepartment.getParentComp()) { - params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(jclDepartment.getParentComp()))); + // 更新主表数据 + params.put("is_key", searchParam.getIsKey()); + if (null != searchParam.getParentJob()) { + JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob()); + params.put("parent_dept", parentJob.getParentDept()); + params.put("parent_comp", parentJob.getParentComp()); + params.put("ec_company", parentJob.getEcCompany()); + params.put("ec_department", parentJob.getEcDepartment()); + } else { + Long ecDepartment = searchParam.getEcDepartment(); + DepartmentPO jclDepartment = EcHrmRelationUtil.getJclDepartmentId(Util.null2String(ecDepartment)); + params.put("parent_dept", jclDepartment.getId()); + params.put("parent_comp", jclDepartment.getParentComp()); + if (null != jclDepartment.getParentComp()) { + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(jclDepartment.getParentComp()))); + } } + params.put("jobactivityid", JOB_ACTIVITY_ID); + new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, oldJobPO).sync(); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); + + JobPO jobById = getJobMapper().getJobById(searchParam.getId()); + new JobTriggerRunnable(oldJobPO, jobById).run(); + // 更新人员关联字段 + updateResourceJob(jobById); } - params.put("jobactivityid", JOB_ACTIVITY_ID); - new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, oldJobPO).sync(); - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); // 更新主表拓展表 - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, "", searchParam.getId()); // 更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, params, searchParam.getId()); - JobPO jobById = getJobMapper().getJobById(searchParam.getId()); - new JobTriggerRunnable(oldJobPO, jobById).run(); - // 更新人员关联字段 - updateResourceJob(jobById); return searchParam.getId(); } @@ -590,7 +590,7 @@ public class JobServiceImpl extends Service implements JobService { targetJob.setJobName(mergeParam.getMergeName()); getJobMapper().updateBaseJob(targetJob); - new JobTriggerRunnable(jobById.getId(),targetJob.getId()).run(); + new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run(); // 原岗位删除 new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync(); getJobMapper().deleteByIds(Collections.singletonList(jobById.getId())); @@ -642,11 +642,11 @@ public class JobServiceImpl extends Service implements JobService { * @param compPO * @param builderComps */ - private void buildParentComps(CompPO compPO, Set builderComps,Map allMaps) { + private void buildParentComps(CompPO compPO, Set builderComps, Map allMaps) { builderComps.add(compPO); CompPO parentComp = allMaps.get(compPO.getParentCompany()); if (null != parentComp && 0 == parentComp.getForbiddenTag()) { - buildParentComps(parentComp, builderComps,allMaps); + buildParentComps(parentComp, builderComps, allMaps); } } @@ -711,7 +711,7 @@ public class JobServiceImpl extends Service implements JobService { Map allMaps = allCompanys.stream().collect(Collectors.toMap(CompPO::getId, item -> item, (k1, k2) -> k1)); Set builderComps = new HashSet<>(); for (CompPO compPO : filterComps) { - buildParentComps(compPO, builderComps,allMaps); + buildParentComps(compPO, builderComps, allMaps); } return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps), deptTrees); } diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java index 7618acff..2d166f6b 100644 --- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java @@ -50,16 +50,16 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { item.put("companyname", rs.getString("companyname")); fclasslist.add(item); } - String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) "; + String sql = "select id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) "; // 分部分权过滤 DetachUtil detachUtil = new DetachUtil(user.getUID()); if (detachUtil.isDETACH()) { String jclRoleLevels = detachUtil.getJclRoleLevels(); if (StringUtils.isNotBlank(jclRoleLevels)) { - sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid in(" + jclRoleLevels + "))) "; + sql = "select id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid in(" + jclRoleLevels + "))) "; } else { - sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0 "; + sql = "select id, fnumber, fname, ftype from jcl_org_map where ftype = 0 "; } } rs.executeQuery(sql + " and fdateend > " + DBType.get(new RecordSet().getDBType()).currentDate() + " order by ftype , id,fdateend desc ");