From 40a6540a1d47ef2c6db22c84b39c5a762ee22670 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 30 Nov 2022 15:55:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/JobBrowserService.java | 6 +- .../entity/department/bo/DepartmentBO.java | 2 +- .../organization/entity/job/bo/JobBO.java | 6 +- .../entity/job/dto/JobListDTO.java | 10 +-- .../organization/mapper/job/JobMapper.java | 2 +- .../organization/mapper/job/JobMapper.xml | 24 +++---- .../mapper/resource/ResourceMapper.xml | 21 +++--- .../mapper/trigger/JobTriggerMapper.java | 2 - .../mapper/trigger/JobTriggerMapper.xml | 8 --- .../service/impl/CompServiceImpl.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 65 +++++++------------ .../service/impl/HrmResourceServiceImpl.java | 8 +-- .../service/impl/JobServiceImpl.java | 14 ++-- .../organization/util/PageInfoSortUtil.java | 4 +- 14 files changed, 74 insertions(+), 100 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 5ee67204..80b79b22 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -195,18 +195,18 @@ public class JobBrowserService extends BrowserService { } else if ("1".equals(params.getType())) { // 当前节点下的元素 CompanyPO compBuild = CompanyPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build(); - List compList = MapperProxyFactory.getProxy(CompanyMapper.class).listByFilter(compBuild, "show_order"); + List compList = MapperProxyFactory.getProxy(CompanyMapper.class).listByFilter(compBuild, "showorder"); if (detachUtil.isDETACH()) { detachUtil.filterCompanyList(compList); } DepartmentPO departmentBuild = DepartmentPO.builder().subCompanyId1(Integer.parseInt(params.getId())).canceled(0).build(); - List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "show_order"); + List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "showorder"); compList.forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); departmentList.stream().filter(item -> null == item.getSupDepId() || 0 == item.getSupDepId()).forEach(item -> buildDeptNodes(treeNodes, hasSubDepartment, item)); } else if ("2".equals(params.getType())) { DepartmentPO departmentBuild = DepartmentPO.builder().supDepId(Integer.parseInt(params.getId())).canceled(0).build(); - List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "show_order"); + List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "showorder"); departmentList.forEach(item -> buildDeptNodes(treeNodes, hasSubDepartment, item)); } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 69045869..124cf22b 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -132,7 +132,7 @@ public class DepartmentBO { return departmentPOS.stream().map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); - tree.setCanceled(item.getCanceled() != 0); + tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0); tree.setIcon(isLeaf ? "icon-coms-Branch" : "icon-coms-LargeArea"); tree.setId(item.getId().toString()); tree.setIsParent(false); diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index a3feafda..bce53d58 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -34,7 +34,7 @@ public class JobBO { .ecCompany(param.getEcCompany()) .ecDepartment(param.getEcDepartment()) .parentComp(param.getSubcompanyid1()) - .parentDept( param.getDepartmentid()) + .parentDept(param.getDepartmentid()) .sequenceId(param.getSequenceId()) .schemeId(param.getSchemeId()) .parentJob(param.getParentJob()) @@ -83,8 +83,8 @@ public class JobBO { .id(e.getId()) .jobNo(e.getJobNo()) .jobName(e.getJobName()) - .compName(e.getCompName()) - .deptName(e.getDeptName()) + .subCompanyName(e.getSubCompanyName()) + .departmentName(e.getDepartmentName()) .sequenceName(e.getSequenceName()) .schemeName(e.getSchemeName()) //.parentJob(e.getParentJob()) diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 55f41399..f57fc163 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -34,7 +34,7 @@ public class JobListDTO { /** * 名称 */ - @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName",width = "150") + @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName", width = "150") private String jobName; /** * 编号 @@ -44,13 +44,13 @@ public class JobListDTO { /** * 所属分部 */ - @TableTitle(title = "所属分部", dataIndex = "compName", key = "compName") - private String compName; + @TableTitle(title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName") + private String subCompanyName; /** * 所属部门 */ - @TableTitle(title = "所属部门", dataIndex = "deptName", key = "deptName") - private String deptName; + @TableTitle(title = "所属部门", dataIndex = "departmentName", key = "departmentName") + private String departmentName; /** * 岗位序列 */ diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 5a217c41..c4f1d786 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -176,7 +176,7 @@ public interface JobMapper { * @param parentCompany * @return */ - int updateJobCompany(@Param("ids") Collection ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") String ecCompany); + int updateJobCompany(@Param("ids") Collection ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany); int isHasResource(@Param("jobId") Long jobId); } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 12498ca0..b6ec28f1 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -367,16 +367,16 @@ SELECT - a.comp_name , - b.dept_name , + a.subcompanyname , + b.departmentname , c.sequence_name, d.scheme_name, FROM jcl_org_job t - left join jcl_org_comp a on - t.parent_comp = a.id - left join jcl_org_dept b on - t.parent_dept = b.id + left join hrmsubcompany a on + t.ec_company = a.id + left join hrmdepartment b on + t.ec_department = b.id left join jcl_org_sequence c on t.sequence_id = c.id left join jcl_org_scheme d on diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml index fecb80df..8ff1030a 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.xml @@ -33,7 +33,10 @@ - t.id,t.work_code,t.last_name,t.sex,t.status,t.account_type, + t + . + id + ,t.work_code,t.last_name,t.sex,t.status,t.account_type, t.belong_to,t.ec_company,t.job_title,t.ec_department,t. scheme_id,t.sequence_id,t.job_grade,t.job_level,t.job_group_id, t.job_activity,t.location_id,t.show_order,t.company_start_date, @@ -53,11 +56,11 @@ - \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index b47edc8e..a1c08d7c 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -105,7 +105,7 @@ public class CompServiceImpl extends Service implements CompService { CompanyPO companyPO = CompanyBO.convertParamToPO(params, user.getUID()); boolean filter = isFilter(companyPO); PageInfo pageInfos; - String orderSql = PageInfoSortUtil.getSortSql(params.getSortParams()); + String orderSql = PageInfoSortUtil.getSortSql(params.getSortParams()," showorder "); List allList = getCompanyMapper().listAll(orderSql); new DetachUtil(user.getUID()).filterCompanyList(allList); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index ff2e1dc6..c0b0e382 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -24,20 +24,15 @@ import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; -import com.engine.organization.entity.map.JclOrgMap; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.enums.LogModuleNameEnum; -import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.exception.OrganizationRunTimeException; import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompanyMapper; import com.engine.organization.mapper.department.DepartmentMapper; -import com.engine.organization.mapper.extend.ExtDTMapper; -import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; -import com.engine.organization.mapper.jclorgmap.JclOrgMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.ExtService; @@ -50,7 +45,6 @@ import com.engine.organization.util.detach.DetachUtil; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; -import com.engine.organization.util.relation.EcHrmRelationUtil; import com.engine.organization.util.tree.SearchTreeUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; @@ -173,7 +167,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(departmentPO); PageInfo pageInfos; - String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams()); + String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams()," showorder "); List allList = getDepartmentMapper().listAll(orderSql); new DetachUtil(user.getUID()).filterDepartmentList(allList); // 通过子级遍历父级元素 @@ -528,6 +522,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setSupDepId(parentDepartmentId); // 显示顺序字段 deptById.setShowOrder(++maxShowOrder); + deptById.setUuid(null); // 新增EC表部门 Map syncMap = addEcDepartment(deptById); @@ -544,7 +539,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService if (maxJobOrder == null) { maxJobOrder = 0; } - recursionCopyJob(jobPOS, companyId, deptById.getId(), null, maxJobOrder, timeMillis); + recursionCopyJob(jobPOS, companyId, Integer.parseInt(ecDepartmentID), null, maxJobOrder, timeMillis); } // 是否复制子部门信息 @@ -553,7 +548,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List deptListByPId = getDepartmentMapper().getDeptListByPId(originalDeptId); for (DepartmentPO departmentPO : deptListByPId) { // 复制子部门信息、子部门岗位信息 - recursionCopyDept(departmentPO.getId(), deptById.getId(), companyId, maxShowOrder, copySubJob, copySubDept, copySubJob); + recursionCopyDept(departmentPO.getId(), Integer.parseInt(ecDepartmentID), companyId, maxShowOrder, copySubJob, copySubDept, copySubJob); } } } @@ -579,17 +574,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 被合并部门 Integer ecParamDepartment = mergeParam.getDepartment(); DepartmentPO targetDepartment = getDepartmentMapper().getDeptById(ecParamDepartment); - // map表中合并部门parentID - Integer oldParamDepartment = mergeParam.getId(); - DepartmentPO oldDepartment = getDepartmentMapper().getDeptById(oldParamDepartment); - Integer oldFParentId = null; - if (null != oldDepartment) { - java.sql.Date currentDate = new java.sql.Date(OrganizationDateUtil.stringToDate(OrganizationDateUtil.getFormatLocalDate(new Date())).getTime()); - JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), oldDepartment.getId().toString()); - if (null != jclOrgMap) { - oldFParentId = jclOrgMap.getFParentId(); - } - } + // 断言判断 OrganizationAssert.isFalse(null == targetDepartment, "被合并部门数据有误，暂时无法合并"); @@ -644,14 +629,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService forbiddenChildTag(targetDepartment.getSubCompanyId1(), Util.null2String(targetDepartment.getSubCompanyId1()), deptList); } // 原部门删除 - DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); + // DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); Map map = new HashMap<>(); - map.put("id", mergeParam.getId()); - new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.CANCELED, map).sync(); - // 删除拓展表、明细表 - MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_deptext", mergeParam.getId()); - MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_deptext_dt1", mergeParam.getId(), null); - // TODO 删除 getDepartmentMapper().deleteByIds(DeleteParam.builder().ids(mergeParam.getId().toString()).build().getIds()); + map.put("id", Util.null2String(mergeParam.getId())); + // 删除部门 + ServiceUtil.getService(OrganizationServiceImpl.class, user).delDepartment(map, user); // 更新组织架构图 // TODO new DepartmentTriggerRunnable(mergeDepartment).run(); // 更新部门合并后名称 @@ -725,7 +707,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService refreshJobComp(deptById.getId(), deptById.getSubCompanyId1()); List deptList = getDepartmentMapper().getDeptListByPId(deptById.getId()); // 更新当前部门下的人员 - new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", deptById.getSubCompanyId1(), deptById.getId()); + // new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", deptById.getSubCompanyId1(), deptById.getId()); //// 更新人员组织架构图 //List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString()); //for (Long hrmResourceId : hrmResourceIds) { @@ -747,16 +729,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService for (DepartmentPO departmentPO : deptList) { departmentPO.setSubCompanyId1(parentComp); // 更新EC表部门 - updateEcDepartment(departmentPO); + updateEcDepartment(departmentPO); // 更新组织架构图 // TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); // 刷新岗位所属分部 refreshJobComp(departmentPO.getId(), parentComp); // 更新当前部门下的人员 - String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString()); - new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId); - new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", parentComp, ecCompanyId, departmentPO.getId()); + // String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString()); + //new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId); + //new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", parentComp, ecCompanyId, departmentPO.getId()); //List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString()); //// 更新人员组织架构图 //for (Long hrmResourceId : hrmResourceIds) { @@ -905,12 +887,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService Map map = new HashMap<>(); map.put("departmentmark", departmentPO.getDepartmentMark()); map.put("departmentname", departmentPO.getDepartmentName()); - map.put("subcompanyid1", departmentPO.getSubCompanyId1()); - map.put("supdepid", departmentPO.getSupDepId()); - map.put("showorder", departmentPO.getShowOrder()); + map.put("subcompanyid1", Util.null2String(departmentPO.getSubCompanyId1())); + map.put("supdepid", Util.null2String(departmentPO.getSupDepId())); + map.put("showorder", Util.null2String(departmentPO.getShowOrder())); map.put("departmentcode", departmentPO.getDepartmentCode()); - map.put("coadjutant", departmentPO.getCoadjutant()); - map.put("id", departmentPO.getId()); + map.put("coadjutant", Util.null2String(departmentPO.getCoadjutant())); + map.put("id", Util.null2String(departmentPO.getId())); new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, map).sync(); } @@ -924,9 +906,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService Map map = new HashMap<>(); map.put("departmentmark", departmentPO.getDepartmentMark()); map.put("departmentname", departmentPO.getDepartmentName()); - map.put("subcompanyid1", departmentPO.getSubCompanyId1()); - map.put("supdepid", departmentPO.getSupDepId()); - map.put("showorder", departmentPO.getShowOrder()); + map.put("subcompanyid1", Util.null2String(departmentPO.getSubCompanyId1())); + map.put("supdepid", Util.null2String(departmentPO.getSupDepId())); + map.put("showorder", Util.null2String(departmentPO.getShowOrder())); map.put("departmentcode", departmentPO.getDepartmentCode()); return new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.ADD, map).sync(); } @@ -961,8 +943,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment); jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(jobPOS)) { - String ecCompanyId = EcHrmRelationUtil.getEcCompanyId(parentComp.toString()); - getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, ecCompanyId); + getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp); for (JobPO jobPO : jobPOS) { // 刷新组织架构图 new JobTriggerRunnable(jobPO.getId()).run(); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 9aa19baf..f4c9a28c 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -577,7 +577,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private List buildTreeByCompAndDept(DepartmentPO departmentBuild, CompanyPO compBuild, JobPO jobBuild) { List jobPOS = getJobMapper().listPOsByFilter(jobBuild); new DetachUtil(user.getUID()).filterJobList(jobPOS); - List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "show_order"); + List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "showorder"); new DetachUtil(user.getUID()).filterDepartmentList(filterDeparts); // 添加父级岗位 Set builderJobs = new HashSet<>(); @@ -607,7 +607,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic } // 查询分部信息 - List filterComps = getCompanyMapper().listByFilter(compBuild, "show_order"); + List filterComps = getCompanyMapper().listByFilter(compBuild, "showorder"); new DetachUtil(user.getUID()).filterCompanyList(filterComps); Set builderDeparts = new HashSet<>(); for (DepartmentPO departmentPO : filterDeparts) { @@ -624,7 +624,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic filterComps.addAll(compsByIds); } } - List allCompanys = getCompanyMapper().listAll("show_order"); + List allCompanys = getCompanyMapper().listAll("showorder"); new DetachUtil(user.getUID()).filterCompanyList(allCompanys); Map allMaps = allCompanys.stream().collect(Collectors.toMap(CompanyPO::getId, item -> item, (k1, k2) -> k1)); Set builderComps = new HashSet<>(); @@ -636,7 +636,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private List buildTreeByDeptAndJob(DepartmentPO departmentBuild, JobPO jobBuild) { List jobPOS = getJobMapper().listPOsByFilter(jobBuild); - List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "show_order"); + List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "showorder"); // 添加父级岗位 Set builderJobs = new HashSet<>(); for (JobPO jobPO : jobPOS) { diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 4eb922ec..7757a721 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -163,7 +163,7 @@ public class JobServiceImpl extends Service implements JobService { JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(jobPO); PageInfo pageInfos; - String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams()); + String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams(), " show_order "); List allList = getJobMapper().listNoFilter(orderSql); new DetachUtil(user.getUID()).filterJobDTOList(allList); // 通过子级遍历父级元素 @@ -631,7 +631,7 @@ public class JobServiceImpl extends Service implements JobService { return; } DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getSupDepId()); - if (null != parentDept && 0 == parentDept.getCanceled()) { + if (null != parentDept && (null == parentDept.getCanceled() || 0 == parentDept.getCanceled())) { buildParentDepts(parentDept, builderDeparts); } } @@ -645,7 +645,7 @@ public class JobServiceImpl extends Service implements JobService { private void buildParentComps(CompanyPO compPO, Set builderComps, Map allMaps) { builderComps.add(compPO); CompanyPO parentComp = allMaps.get(compPO.getSupSubComId()); - if (null != parentComp && 0 == parentComp.getCanceled()) { + if (null != parentComp && (null == parentComp.getCanceled() || 0 == parentComp.getCanceled())) { buildParentComps(parentComp, builderComps, allMaps); } } @@ -669,7 +669,7 @@ public class JobServiceImpl extends Service implements JobService { } else if (TYPE_DEPT.equals(type)) { // // 查询部门信息 - List filterDeparts = getDepartmentMapper().listByFilter(DepartmentPO.builder().departmentName(keyword).canceled(0).supDepId(Integer.parseInt(id)).build(), "show_order"); + List filterDeparts = getDepartmentMapper().listByFilter(DepartmentPO.builder().departmentName(keyword).canceled(0).supDepId(Integer.parseInt(id)).build(), "showorder"); Set builderDeparts = new HashSet<>(); for (DepartmentPO departmentPO : filterDeparts) { buildParentDepts(departmentPO, builderDeparts); @@ -688,10 +688,10 @@ public class JobServiceImpl extends Service implements JobService { * @return */ private List buildTreeByCompAndDept(DepartmentPO departmentBuild, CompanyPO compBuild) { - List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "show_order"); + List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild, "showorder"); new DetachUtil(user.getUID()).filterDepartmentList(filterDeparts); // 查询分部信息 - List filterComps = getCompanyMapper().listByFilter(compBuild, "show_order"); + List filterComps = getCompanyMapper().listByFilter(compBuild, "showorder"); new DetachUtil(user.getUID()).filterCompanyList(filterComps); Set builderDeparts = new HashSet<>(); for (DepartmentPO departmentPO : filterDeparts) { @@ -706,7 +706,7 @@ public class JobServiceImpl extends Service implements JobService { filterComps.addAll(compsByIds); } } - List allCompanys = getCompanyMapper().listAll("show_order"); + List allCompanys = getCompanyMapper().listAll("showorder"); new DetachUtil(user.getUID()).filterCompanyList(allCompanys); Map allMaps = allCompanys.stream().collect(Collectors.toMap(CompanyPO::getId, item -> item, (k1, k2) -> k1)); Set builderComps = new HashSet<>(); diff --git a/src/com/engine/organization/util/PageInfoSortUtil.java b/src/com/engine/organization/util/PageInfoSortUtil.java index 4bed8263..902ba5c5 100644 --- a/src/com/engine/organization/util/PageInfoSortUtil.java +++ b/src/com/engine/organization/util/PageInfoSortUtil.java @@ -20,7 +20,7 @@ public class PageInfoSortUtil { * @param sortParams * @return */ - public static String getSortSql(String sortParams) { + public static String getSortSql(String sortParams, String defaultOrder) { JSONArray jsonArray = JSONObject.parseArray(sortParams); if (CollectionUtils.isNotEmpty(jsonArray)) { JSONObject jsonObject = (JSONObject) jsonArray.get(0); @@ -28,7 +28,7 @@ public class PageInfoSortUtil { String sortOrder = jsonObject.getString("sortOrder").replace("end", ""); return "t." + orderKey + " " + sortOrder; } - return " showOrder "; + return defaultOrder; } /**