From b572bc4d48c76de6b79cfe87c9bb1c21275ee92b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 10 Oct 2024 16:38:32 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86Delete=5Ftype=3D1=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cronjob/TableDeleteDataCron.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java diff --git a/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java b/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java new file mode 100644 index 00000000..361589f0 --- /dev/null +++ b/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java @@ -0,0 +1,34 @@ +package weaver.interfaces.organization.cronjob; + +import weaver.conn.RecordSet; +import weaver.interfaces.schedule.BaseCronJob; + +/** + * @Author liang.cheng + * @Date 2024/10/10 1:56 PM + * @Description: 定时清除组织管理Delete_type=1的数据 + * @Version 1.0 + */ +public class TableDeleteDataCron extends BaseCronJob { + + @Override + public void execute() { + RecordSet rs = new RecordSet(); + + rs.execute("delete from jcl_org_scheme where delete_type = 1"); + rs.execute("delete from jcl_org_level where delete_type = 1"); + rs.execute("delete from jcl_org_grade where delete_type = 1"); + rs.execute("delete from jcl_org_sequence where delete_type = 1"); + rs.execute("delete from jcl_org_staffplan where delete_type = 1"); + rs.execute("delete from jcl_org_staff where delete_type = 1"); + rs.execute("delete from jcl_org_job where delete_type = 1"); + rs.execute("delete from jcl_org_jobext where delete_type = 1"); + rs.execute("delete from jcl_org_jobext_dt1 where delete_type = 1"); + rs.execute("delete from jcl_org_detach where delete_type = 1"); + rs.execute("delete from jcl_org_cardaccess where delete_type = 1"); + rs.execute("delete from jcl_org_cardbutton where delete_type = 1"); + rs.execute("delete from jcl_field_extendgroup where delete_type = 1"); + rs.execute("delete from jcl_field_extendtitle where delete_type = 1"); + rs.execute("delete from jcl_field_extendinfo where delete_type = 1"); + } +} From ea5809ac15b3b941a8566be61219b19d40ab5498 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 15 Oct 2024 16:08:48 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3esb=E7=BC=BA=E5=B0=91UESE=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0sysadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FunctionOutStaffServiceImpl.java | 3 +-- .../engine/organization/web/StaffOutController.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index 20e172e7..778c25bb 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl { OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage())); } - List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum()); + List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum()); //1.增加冻结数 （num为负数时为减少冻结数） Integer sum = numberF.stream() .mapToInt(Integer::intValue) @@ -233,7 +233,6 @@ public class FunctionOutStaffServiceImpl { bb.writeLog("编制参数"+ JSON.toJSONString(param)); bb.writeLog("查询结果"+ JSON.toJSONString(staffPO)); bb.writeLog("user对象"+JSON.toJSONString(user)); - bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage())); OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage())); return staffPO.get(0); } diff --git a/src/com/engine/organization/web/StaffOutController.java b/src/com/engine/organization/web/StaffOutController.java index fe83f92a..53dde409 100644 --- a/src/com/engine/organization/web/StaffOutController.java +++ b/src/com/engine/organization/web/StaffOutController.java @@ -36,6 +36,11 @@ public class StaffOutController { public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); @@ -48,6 +53,11 @@ public class StaffOutController { public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); From 4d2e8a8035e6626a81dd254f61d88ea58bb9ef88 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 21 Oct 2024 10:06:08 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4=E6=80=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cronjob/DeleteIsCancelJobCrob.java | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java diff --git a/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java b/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java new file mode 100644 index 00000000..c9268854 --- /dev/null +++ b/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java @@ -0,0 +1,65 @@ +package weaver.interfaces.organization.cronjob; + +import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.collections.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.interfaces.schedule.BaseCronJob; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author liang.cheng + * @Date 2024/10/18 11:25 AM + * @Description: 自动清除已失效的岗位 （执行前请注意编制的引用，会出现名称为空） + * @Version 1.0 + */ +public class DeleteIsCancelJobCrob extends BaseCronJob { + + @Override + public void execute() { + + RecordSet rs = new RecordSet(); + + List jobList = new ArrayList<>(); + rs.executeQuery("select id,ec_jobtitle,ec_department from jcl_org_job where delete_type = 0"); + while (rs.next()) { + jobList.add(JobPO.builder() + .id((long)Util.getIntValue(rs.getString("id"))) + .ecJobTitle(Util.getIntValue(rs.getString("ec_jobtitle"))) + .ecDepartment(Util.getIntValue(rs.getString("ec_department"))) + .build()); + } + + + + List deleteIds = new ArrayList<>(); + + jobList.forEach(job -> { + + //1.岗位是否封存或删除 + rs.executeQuery("select id from hrmjobtitles where id = ? and (canceled is null or canceled != 1)",job.getEcJobTitle()); + if (!rs.next()) { + deleteIds.add(job.getId()); + return; + } + + //2.部门是否封存或删除 + rs.executeQuery("select id from hrmdepartment where id = ? and (canceled is null or canceled != 1)",job.getEcDepartment()); + if (!rs.next()) { + deleteIds.add(job.getId()); + } + + }); + + if (CollectionUtils.isNotEmpty(deleteIds)) { + MapperProxyFactory.getProxy(JobMapper.class).deleteByIds(deleteIds); + } + + + + } +} From 5ed00c6a24dd4d9dc8e3a2ccbbdf3c8bd9002398 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 21 Oct 2024 13:54:31 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/mapper/job/JobMapper.java | 2 +- src/com/engine/organization/mapper/job/JobMapper.xml | 6 ++++-- .../util/saveimport/StaffInfoImportUtil.java | 10 ++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 275db287..553a2ad5 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -141,7 +141,7 @@ public interface JobMapper { * @param parentJob * @return */ - Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob, + List getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob, @Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark); int updateJobCompany(@Param("ids") Collection ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany); diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 2580bdb5..617112fa 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -482,8 +482,10 @@ and delete_type = 0 - + select + + from jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id left join hrmjobactivities j on h.jobactivityid = j.id left join hrmjobgroups f on j.jobgroupid = f.id diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index 2abe93b2..d69ce8b1 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -222,9 +222,15 @@ public class StaffInfoImportUtil { continue nextRow; } for (String s : split) { - parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId + List jobPList = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId ,jobactivitymark,jobgroupremark); - if (null == parentJobId) { + if (jobPList.size() > 1) { + historyDetailPO.setOperateDetail(s + "岗位在岗位管理中存在重复数据，请先处理"); + historyDetailPO.setStatus("0"); + OrgImportUtil.saveImportDetailLog(historyDetailPO); + continue nextRow; + } + if (jobPList.size() == 0) { historyDetailPO.setOperateDetail(s + "岗位未找到对应数据"); historyDetailPO.setStatus("0"); OrgImportUtil.saveImportDetailLog(historyDetailPO); From f254feb12888454a0a3096b9a3b24e45dde2cde4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 15:04:06 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C-=E5=88=97?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=B7=BB=E5=8A=A0=E5=88=86=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/company/bo/CompBO.java | 6 +++++- .../organization/entity/company/po/CompPO.java | 14 ++++++++++++++ .../entity/department/bo/DepartmentBO.java | 1 + .../entity/searchtree/SearchTree.java | 15 +++++++++++++++ .../mapper/department/DepartmentMapper.xml | 2 ++ .../organization/util/tree/SearchTreeUtil.java | 11 +++++++++-- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 240fa93a..91cc94b7 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -24,7 +24,10 @@ public class CompBO { } public static List buildSetToSearchTree(Set comps) { - return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> { + return comps.stream().sorted(Comparator + .comparing(CompPO::getShowOrder) + .thenComparing(CompPO::getShowOrderOfTree) + ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0); @@ -37,6 +40,7 @@ public class CompBO { tree.setSelected(false); tree.setType("1"); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index ae80432d..e88eb539 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -34,4 +34,18 @@ public class CompPO { private String uuid; private Integer showOrder; private Integer showOrderOfTree; + + public Integer getShowOrder() { + if (null == showOrder) { + return 0; + } + return showOrder; + } + + public Integer getShowOrderOfTree() { + if (null == showOrderOfTree) { + return 0; + } + return showOrderOfTree; + } } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 2bc46841..dd2127e2 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -173,6 +173,7 @@ public class DepartmentBO { tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 849670cf..6c3b000f 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -19,6 +19,7 @@ public class SearchTree extends TreeNode { private String requestParams; private String parentComp; private Integer orderNum; + private Integer showOrderOfTree; public String getCompanyid() { return companyid; @@ -77,6 +78,9 @@ public class SearchTree extends TreeNode { } public Integer getOrderNum() { + if(null==orderNum){ + return 0; + } return orderNum; } @@ -84,6 +88,17 @@ public class SearchTree extends TreeNode { this.orderNum = orderNum; } + public Integer getShowOrderOfTree() { + if(null==showOrderOfTree){ + return 0; + } + return showOrderOfTree; + } + + public void setShowOrderOfTree(Integer showOrderOfTree) { + this.showOrderOfTree = showOrderOfTree; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 7d288abe..ace82766 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -12,6 +12,7 @@ + @@ -30,6 +31,7 @@ t.departmentCode, t.coadjutant, t.showOrder, + t.showOrderOfTree, t.uuid diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 60b7ce31..2ba24e24 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -91,7 +91,11 @@ public class SearchTreeUtil { Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { - List nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList()); + List nodes = collects.get(e.getId()).stream().sorted(Comparator + .comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ) + .collect(Collectors.toList()); e.setSubs(nodes); leafIds.add(e.getId()); if (CollectionUtils.isNotEmpty(e.getSubs())) { @@ -117,7 +121,10 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + List searchTrees = childMap.get(e.getId()).stream().sorted( + Comparator.comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } List nodes = parentMap.get(e.getId()); From 95d3dac14f0e464fa9175e0739e56f46b780102c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 15:04:06 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C-=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=91=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/company/bo/CompBO.java | 6 +++++- .../organization/entity/company/po/CompPO.java | 14 ++++++++++++++ .../entity/department/bo/DepartmentBO.java | 1 + .../entity/searchtree/SearchTree.java | 15 +++++++++++++++ .../mapper/department/DepartmentMapper.xml | 2 ++ .../organization/util/tree/SearchTreeUtil.java | 11 +++++++++-- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 240fa93a..91cc94b7 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -24,7 +24,10 @@ public class CompBO { } public static List buildSetToSearchTree(Set comps) { - return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> { + return comps.stream().sorted(Comparator + .comparing(CompPO::getShowOrder) + .thenComparing(CompPO::getShowOrderOfTree) + ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0); @@ -37,6 +40,7 @@ public class CompBO { tree.setSelected(false); tree.setType("1"); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index ae80432d..e88eb539 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -34,4 +34,18 @@ public class CompPO { private String uuid; private Integer showOrder; private Integer showOrderOfTree; + + public Integer getShowOrder() { + if (null == showOrder) { + return 0; + } + return showOrder; + } + + public Integer getShowOrderOfTree() { + if (null == showOrderOfTree) { + return 0; + } + return showOrderOfTree; + } } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 2bc46841..dd2127e2 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -173,6 +173,7 @@ public class DepartmentBO { tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 849670cf..6c3b000f 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -19,6 +19,7 @@ public class SearchTree extends TreeNode { private String requestParams; private String parentComp; private Integer orderNum; + private Integer showOrderOfTree; public String getCompanyid() { return companyid; @@ -77,6 +78,9 @@ public class SearchTree extends TreeNode { } public Integer getOrderNum() { + if(null==orderNum){ + return 0; + } return orderNum; } @@ -84,6 +88,17 @@ public class SearchTree extends TreeNode { this.orderNum = orderNum; } + public Integer getShowOrderOfTree() { + if(null==showOrderOfTree){ + return 0; + } + return showOrderOfTree; + } + + public void setShowOrderOfTree(Integer showOrderOfTree) { + this.showOrderOfTree = showOrderOfTree; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 7d288abe..ace82766 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -12,6 +12,7 @@ + @@ -30,6 +31,7 @@ t.departmentCode, t.coadjutant, t.showOrder, + t.showOrderOfTree, t.uuid diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 60b7ce31..2ba24e24 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -91,7 +91,11 @@ public class SearchTreeUtil { Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { - List nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList()); + List nodes = collects.get(e.getId()).stream().sorted(Comparator + .comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ) + .collect(Collectors.toList()); e.setSubs(nodes); leafIds.add(e.getId()); if (CollectionUtils.isNotEmpty(e.getSubs())) { @@ -117,7 +121,10 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + List searchTrees = childMap.get(e.getId()).stream().sorted( + Comparator.comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } List nodes = parentMap.get(e.getId()); From 14464744b8d9dc3a2556287813a4816f36ab9720 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 26 Sep 2024 15:29:45 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/department/DepartmentMapper.xml | 2 +- .../service/impl/JobServiceImpl.java | 13 +- .../action/WorkflowStaffOperateAction.java | 169 ++++++++++++++++++ 3 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index ace82766..681e4b89 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -98,7 +98,7 @@ - select max(show_order) from jcl_org_job diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a8efd3bd..3735116a 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -367,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService { } if (StringUtils.isBlank(params.get("show_order").toString())) { - Integer maxShowOrder = getJobMapper().getMaxShowOrder(); + Double maxShowOrder = getJobMapper().getMaxShowOrder(); if (null == maxShowOrder) { - maxShowOrder = 0; + maxShowOrder = 0.00; } params.put("show_order", maxShowOrder + 1); } @@ -433,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService { OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage())); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); - Integer orderNum = getJobMapper().getMaxShowOrder(); - orderNum = null == orderNum ? 0 : orderNum; + Double orderNum = getJobMapper().getMaxShowOrder(); + orderNum = null == orderNum ? 0.00 : orderNum; for (Long id : idList) { orderNum++; JobPO jobById = getJobMapper().getJobById(id); diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index c25bc783..632b991c 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu jobPO.setDescription(description); jobPO.setWorkDuty(work_duty); jobPO.setWorkAuthority(work_authority); - jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order)); + jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order)); jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag)); jobPO.setGradeId(grade_id); jobPO.setLevelId(level_id); diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 2ba24e24..0b5a30b9 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -92,8 +92,8 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { List nodes = collects.get(e.getId()).stream().sorted(Comparator - .comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + .comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ) .collect(Collectors.toList()); e.setSubs(nodes); @@ -122,8 +122,8 @@ public class SearchTreeUtil { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { List searchTrees = childMap.get(e.getId()).stream().sorted( - Comparator.comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + Comparator.comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } From 918f2e2a6ea94542725e59b4917959dd1ddf69bf Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 17:42:05 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?Double?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/browser/service/impl/JobBrowserService.java | 2 +- src/com/engine/organization/entity/company/bo/CompBO.java | 4 ++-- .../engine/organization/entity/company/dto/CompListDTO.java | 4 ++-- .../organization/entity/department/dto/DepartmentListDTO.java | 4 ++-- src/com/engine/organization/service/impl/CompServiceImpl.java | 4 ++-- .../organization/service/impl/DepartmentServiceImpl.java | 4 ++-- src/com/engine/organization/service/impl/JobServiceImpl.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index feca2a7b..5e60fd17 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -234,7 +234,7 @@ public class JobBrowserService extends BrowserService { compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); } // 获取顶层分部 - compList.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); + compList.stream().sorted(Comparator.comparingDouble(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); } else if ("1".equals(params.getType())) { // 当前节点下的元素 CompPO compBuild = CompPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build(); diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 91cc94b7..1e7f7d25 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -25,8 +25,8 @@ public class CompBO { public static List buildSetToSearchTree(Set comps) { return comps.stream().sorted(Comparator - .comparing(CompPO::getShowOrder) - .thenComparing(CompPO::getShowOrderOfTree) + .comparingDouble(CompPO::getShowOrder) + .thenComparingDouble(CompPO::getShowOrderOfTree) ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 36e3b484..a49ff720 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -89,9 +89,9 @@ public class CompListDTO { return children; } if ("asc".equalsIgnoreCase(orderType)) { - return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList()); } else { - return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } } } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 45361dc8..b16a3186 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -105,9 +105,9 @@ public class DepartmentListDTO { return children; } if ("asc".equalsIgnoreCase(orderType)) { - return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); } else { - return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } } } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 3a9680d7..4e6b0596 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -85,10 +85,10 @@ public class CompServiceImpl extends Service implements CompService { // 添加父级元素 List compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs, orderType.toString()); if ("asc".equalsIgnoreCase(orderType.toString())) { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList()); } else { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(user, subList, CompListDTO.class); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 897d407a..7e167447 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -134,10 +134,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 添加父级元素 List compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString()); if ("asc".equalsIgnoreCase(orderType.toString())) { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); } else { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 3735116a..b4a23232 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -164,10 +164,10 @@ public class JobServiceImpl extends Service implements JobService { // 添加父级元素 List jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs); if ("asc".equalsIgnoreCase(orderType.toString())) { - jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList()); + jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder)).collect(Collectors.toList()); } else { - jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS); pageInfos = new PageInfo<>(user, subList, JobListDTO.class); From cffa697c2f701161ad44d36166f52c3863459dc0 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 23 Oct 2024 16:39:01 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8FBUG=E4=BF=AE=E5=A4=8D=20like=E6=90=9C=E7=B4=A2BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/department/bo/DepartmentBO.java | 2 +- .../organization/service/impl/HrmResourceServiceImpl.java | 2 +- .../service/impl/ManagerDetachServiceImpl.java | 4 +--- src/com/engine/organization/util/tree/SearchTreeUtil.java | 8 ++++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index f3826341..1b51b49b 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -173,7 +173,7 @@ public class DepartmentBO { tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue()); - tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index d4a8d129..7903d988 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1280,7 +1280,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic case BROWSER://浏览按钮 // 兼容多选浏览按钮 - sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value)); + sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like("," + value + ",")); break; case INPUTNUMBER:// 数字 diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 0809ce59..99182816 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -27,8 +27,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; -import weaver.hrm.cachecenter.bean.RolemembersComInfo; -import weaver.hrm.resource.ResourceComInfo; import weaver.hrm.roles.RolesComInfo; import weaver.systeminfo.SystemEnv; @@ -233,7 +231,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe } String ecRolelevel = (String) params.get("ecRolelevel"); if (StringUtils.isNotBlank(ecRolelevel)) { - sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like(ecRolelevel); + sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like("," + ecRolelevel + ","); } return sqlWhere; } diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 0b5a30b9..f41224b5 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -114,7 +114,7 @@ public class SearchTreeUtil { * @return */ public static List builderTreeMode(List treeList, List deptTrees) { - Map> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + Map> parentMap = treeList.stream().collect(Collectors.groupingBy(SearchTree::getPid)); Map> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp)); boolean isAdd = !childMap.isEmpty(); Set leafIds = new HashSet<>(); @@ -127,8 +127,12 @@ public class SearchTreeUtil { ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } - List nodes = parentMap.get(e.getId()); + List nodes = parentMap.get(e.getId()); if (CollectionUtils.isNotEmpty(nodes)) { + nodes = nodes.stream().sorted( + Comparator.comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) + ).collect(Collectors.toList()); treeNodes.addAll(nodes); } e.setSubs(new ArrayList<>(treeNodes)); From 76d91381913d284453314a05e0405ea8bf7a7def Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 21 Nov 2024 17:52:53 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E5=8E=86=E5=8F=B2=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=AD=98=E5=82=A8=E9=97=AE=E9=A2=98=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/ChartServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 957a0852..4bc2e1d4 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService { " left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 "; deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1 as subcompanyid, " + "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," + - "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " + + "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " + "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " + "left join hrmdepartment c on a.supdepid = c.id " + "left join hrmdepartmentdefined d on a.id=d.deptid " + @@ -1040,7 +1040,7 @@ public class ChartServiceImpl extends Service implements ChartService { " a.departmentcode,\n" + " a.coadjutant,\n" + " a.tlevel,\n" + - " a.bmfzr as fleader,\n" + + " d.bmfzr as fleader,\n" + " d.on_job_num,\n" + " d.staff_num" + " from hrmdepartment a\n" + @@ -1671,9 +1671,6 @@ public class ChartServiceImpl extends Service implements ChartService { * @return 人员名称 */ private String getDepartmentLeader(String ids) { - if (!isRealTime) { - return ids; - } if (StringUtils.isBlank(ids)) { return ""; } From 4beda57943e7e3b1b150dd9b4160f1b88a1c908b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 4 Dec 2024 16:50:43 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E7=BC=96=E5=88=B6=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E4=B8=BA=E5=B2=97=E4=BD=8D=E6=97=B6=E5=AF=BC=E5=85=A5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/saveimport/StaffInfoImportUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index d69ce8b1..be3e7246 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -236,6 +236,8 @@ public class StaffInfoImportUtil { OrgImportUtil.saveImportDetailLog(historyDetailPO); continue nextRow; } + parentJobId = jobPList.get(0).getId(); + } } map.put("job_id", parentJobId); @@ -292,7 +294,7 @@ public class StaffInfoImportUtil { break; case "3": // 岗位 if (null == parentJobId) { - checkMsg = "编制维度选择岗位时，岗位必填！"; + checkMsg = "编制维度选择岗位时，未找到对应岗位！"; } else { JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId); if (null == jobPO) { From 3a5c5812419ca8f025b57dca3eb0727686a5c013 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 10 Dec 2024 17:06:57 +0800 Subject: [PATCH 16/22] =?UTF-8?q?3.=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=96=E9=83=A8=E4=BA=BA=E5=91=98=E5=BC=95?= =?UTF-8?q?=E5=85=A5=EF=BC=9B=204.=E8=8A=B1=E5=90=8D=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B7=B3=E8=BD=AC=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8D=A1=E7=89=87=E8=BF=98=E6=98=AF=E8=81=9A?= =?UTF-8?q?=E6=89=8D=E6=9E=97=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/mapper/resource/HrmResourceMapper.xml | 2 +- .../organization/service/impl/HrmResourceServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index a5bdb0cd..808ffc0a 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -22,7 +22,7 @@