From c115308f9ecfcb20546a1cbf8c7cd42c26cf3821 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 3 Jul 2023 10:49:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E9=87=8D=E6=9E=84-=E5=BC=82=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/ChartService.java | 15 +++ .../service/impl/ChartServiceImpl.java | 91 ++++++++++++++++--- .../organization/wrapper/OrgChartWrapper.java | 3 +- 3 files changed, 94 insertions(+), 15 deletions(-) diff --git a/src/com/engine/organization/service/ChartService.java b/src/com/engine/organization/service/ChartService.java index 15f8e4aa..d49e9e78 100644 --- a/src/com/engine/organization/service/ChartService.java +++ b/src/com/engine/organization/service/ChartService.java @@ -9,6 +9,21 @@ import java.util.Map; */ public interface ChartService { + /** + * 组织架构图 ,获取数据（同步） + * + * @param params 请求参数 + * @return 数据集合 + */ Map getCompanyData(Map params); + /** + * 组织架构图 ,获取数据（异步） + * + * @param params 请求参数 + * @return 数据集合 + */ + Map asyncCompanyData(Map params); + + } diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 21a446b0..68fdb5af 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -20,7 +20,6 @@ import java.util.Map; */ public class ChartServiceImpl extends Service implements ChartService { private static final String COMPANY_RIGHT = "OrgChart:All"; - private static final String USER_RIGHT = "OrgPerspective:All"; public String COMPANY_TABLE = ""; public String SUB_COMPANY_TABLE = ""; @@ -38,19 +37,6 @@ public class ChartServiceImpl extends Service implements ChartService { */ boolean hasVirtualFields; - public ChartServiceImpl() { - super(); - RecordSet rs = new RecordSet(); - rs.executeQuery("select count(1) as num from hrm_formfield where (GROUPID =6 and FIELDNAME = 'fblx') or (GROUPID =7 and FIELDNAME = 'bmlx')"); - if (rs.next()) { - String num = rs.getString("num"); - hasVirtualFields = "2".equals(num); - - } else { - hasVirtualFields = false; - } - } - @Override public Map getCompanyData(Map params) { Map result = new HashMap<>(); @@ -108,6 +94,74 @@ public class ChartServiceImpl extends Service implements ChartService { return result; } + @Override + public Map asyncCompanyData(Map params) { + + // 维度 + String dimension = Util.null2String(params.get("fclass")); + dimension = StringUtils.isBlank(dimension) ? "0" : dimension; + + // 是否展示虚拟组织 + String isVirtual = Util.null2String(params.get("fisvitual")); + showVirtual = "1".equals(isVirtual); + + // 初始化表名 + initTableNameByClass(dimension); + + String ids = (String) params.get("ids"); + List dataList = new ArrayList<>(); + if (StringUtils.isNotBlank(ids)) { + RecordSet rs = new RecordSet(); + String[] split = ids.split(","); + for (String s : split) { + //TODO 查询当前实际数据 + if (s.contains("_")) { + String fObjId = s.split("_")[1]; + if (s.startsWith("s")) { + if (hasVirtualFields) { + if (showVirtual) { + rs.executeQuery("select a.id,a.subcompanyname as 'name','1' as 'type' ,b.fblx as 'isvitual' from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and a.supsubcomid = '" + fObjId + "'" + + " union select a.id,a.departmentname as 'name','2' as 'type' ,b.bmlx as 'isvitual' from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and subcompanyid1 = '" + fObjId + "'"); + } else { + rs.executeQuery("select a.id,a.subcompanyname as 'name','1' as 'type' ,b.fblx as 'isvitual' from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (b.fblx is null or b.fblx != '1') and a.supsubcomid = '" + fObjId + "'" + + " union select a.id,a.departmentname as 'name','2' as 'type' ,b.bmlx as 'isvitual' from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and (b.bmlx is null or b.bmlx != '1') and subcompanyid1 = '" + fObjId + "'"); + } + } else { + rs.executeQuery("select a.id,a.subcompanyname as 'name','1' as 'type' from " + SUB_COMPANY_TABLE + " a where (canceled is null or canceled != '1') and supsubcomid = '" + fObjId + "'" + + " union select a.id,a.departmentname as 'name','2' as 'type' from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid1 = '" + fObjId + "'"); + } + + } else if (s.startsWith("d")) { + if (hasVirtualFields) { + if (showVirtual) { + rs.executeQuery( "select a.id,a.departmentname as 'name','2' as 'type' ,b.bmlx as 'isvitual' from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and supdepid = '" + fObjId + "'"); + } else { + rs.executeQuery( "select a.id,a.departmentname as 'name','2' as 'type' ,b.bmlx as 'isvitual' from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.supdepid = '" + fObjId + "'"); + } + } else { + rs.executeQuery( "select a.id,a.departmentname as 'name','2' as 'type' from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "'"); + } + } + while (rs.next()){ + ChartPO chartPO = new ChartPO(); + chartPO.setFtype(rs.getString("type")); + chartPO.setFobjid(rs.getString("id")); + chartPO.setFname(rs.getString("name")); + chartPO.setParentId(s); + chartPO.setExpand("0"); + chartPO.setFisvitual(rs.getString("isvitual")); + chartPO.setHasChildren(getHasChildren(chartPO.getFtype(), chartPO.getFobjid()).toString()); + dataList.add(chartPO); + } + } + } + } + Map result = new HashMap<>(); + result.put("api_status", true); + result.put("data", dataList); + return result; + } + /** * 查询实时数据,顶级元素SQL * @@ -234,6 +288,15 @@ public class ChartServiceImpl extends Service implements ChartService { SUB_COMPANY_DEFINED_TABLE = "hrmsubcompanydefined"; DEPARTMENT_TABLE = "hrmdepartment"; DEPARTMENT_DEFINED_TABLE = "hrmdepartmentdefined"; + RecordSet rs = new RecordSet(); + rs.executeQuery("select count(1) as num from hrm_formfield where (GROUPID =6 and FIELDNAME = 'fblx') or (GROUPID =7 and FIELDNAME = 'bmlx')"); + if (rs.next()) { + String num = rs.getString("num"); + hasVirtualFields = "2".equals(num); + + } else { + hasVirtualFields = false; + } } else { COMPANY_TABLE = "hrmcompanyvirtual"; SUB_COMPANY_TABLE = "hrmsubcompanyvirtual"; diff --git a/src/com/engine/organization/wrapper/OrgChartWrapper.java b/src/com/engine/organization/wrapper/OrgChartWrapper.java index 47f35bc7..8d117795 100644 --- a/src/com/engine/organization/wrapper/OrgChartWrapper.java +++ b/src/com/engine/organization/wrapper/OrgChartWrapper.java @@ -49,7 +49,8 @@ public class OrgChartWrapper extends Service { } public Map asyncCompanyData(Map request2Map, User user) { - return getOrgChartService(user).asyncCompanyData(request2Map, user); + // return getOrgChartService(user).asyncCompanyData(request2Map, user); + return getChartService(user).asyncCompanyData(request2Map); } public String synchronousData(Map request2Map) { From a2247ddb12d40f1f9a8ada9fb7ca0370c48c7c2c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 3 Jul 2023 10:50:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?TODO=E6=B3=A8=E9=87=8A=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/OrgVirtualController.java | 1 - .../entity/chart/TimeLinesBO.java | 1 - .../service/OrgVirtualService.java | 1 - .../service/impl/DepartmentServiceImpl.java | 22 +++++++++---------- .../service/impl/JobServiceImpl.java | 10 ++++----- .../service/impl/OrgVirtualServiceImpl.java | 1 - .../thread/OrganizationSyncEc.java | 1 - .../util/saveimport/CompanyImport.java | 4 ++-- .../util/saveimport/DepartmentImport.java | 2 +- .../web/OrgVirtualController.java | 1 - .../organization/wrapper/JobWrapper.java | 4 ++-- .../wrapper/OrgVirtualWrapper.java | 1 - 12 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/com/api/organization/web/OrgVirtualController.java b/src/com/api/organization/web/OrgVirtualController.java index 1af5c00e..daced802 100644 --- a/src/com/api/organization/web/OrgVirtualController.java +++ b/src/com/api/organization/web/OrgVirtualController.java @@ -5,7 +5,6 @@ import javax.ws.rs.Path; /** * @Author liang.cheng * @Date 2023/6/27 3:38 PM - * @Description: TODO * @Version 1.0 */ diff --git a/src/com/engine/organization/entity/chart/TimeLinesBO.java b/src/com/engine/organization/entity/chart/TimeLinesBO.java index ee7c20c0..2f2ff6a4 100644 --- a/src/com/engine/organization/entity/chart/TimeLinesBO.java +++ b/src/com/engine/organization/entity/chart/TimeLinesBO.java @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; /** * @Author liang.cheng * @Date 2023/6/29 11:19 AM - * @Description: TODO * @Version 1.0 */ @Data diff --git a/src/com/engine/organization/service/OrgVirtualService.java b/src/com/engine/organization/service/OrgVirtualService.java index a48d22d3..07c90318 100644 --- a/src/com/engine/organization/service/OrgVirtualService.java +++ b/src/com/engine/organization/service/OrgVirtualService.java @@ -5,7 +5,6 @@ import java.util.Map; /** * @Author liang.cheng * @Date 2023/6/27 3:45 PM - * @Description: TODO * @Version 1.0 */ public interface OrgVirtualService { diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 955c0b36..38188968 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -469,7 +469,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService String ecDepartmentID = Util.null2String(syncMap.get("id")); OrganizationAssert.isTrue(StringUtils.isNotBlank(ecDepartmentID), syncMap.get("message").toString()); // 更新组织架构图 - //TODO new DepartmentTriggerRunnable(deptById.getId()).run(); + // new DepartmentTriggerRunnable(deptById.getId()).run(); // 复制当前部门岗位信息 //if ("1".equals(copyJob)) { @@ -540,7 +540,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService departmentPO.setSubCompanyId1(targetDepartment.getSubCompanyId1()); updateEcDepartment(departmentPO); // 更新组织架构图 - //TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); + // new DepartmentTriggerRunnable(departmentPO.getId()).run(); } // 查询该部门一级岗位、更新岗位所属分部、所属部门 //List firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId()); @@ -553,7 +553,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 更新岗位组织架构图 //for (JobPO jobPO : firstChildJobList) { // // 刷新组织架构图 - // TODO new JobTriggerRunnable(jobPO.getId()).run(); + // new JobTriggerRunnable(jobPO.getId()).run(); //} // 更新当前部门下的人员 rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getSubCompanyId1(), targetEcDeptId, mergeEcDeptId); @@ -561,7 +561,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString()); //// 更新人员组织架构图 //for (Long hrmResourceId : hrmResourceIds) { - //TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); + // new HrmResourceTriggerRunnable(hrmResourceId).run(); //} // 更新子部门下岗位的所属分部 for (DepartmentPO departmentPO : firstChildDeptList) { @@ -575,13 +575,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 删除部门 ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user); // 更新组织架构图 - // TODO new DepartmentTriggerRunnable(mergeDepartment).run(); + // new DepartmentTriggerRunnable(mergeDepartment).run(); // 更新部门合并后名称 targetDepartment.setDepartmentName(mergeParam.getMergeName()); targetDepartment.setDepartmentMark(mergeParam.getMergeName()); updateEcDepartment(targetDepartment); // 更新组织架构图 - // TODO new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run(); + // new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run(); return 0; } @@ -622,7 +622,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setSupDepId(null); // 更新组织架构图 - //TODO new DepartmentTriggerRunnable(company.toString(), deptById).run(); + // new DepartmentTriggerRunnable(company.toString(), deptById).run(); } else if ("1".equals(moveParam.getMoveType())) { Integer departmentId = moveParam.getDepartment(); OrganizationAssert.notNull(departmentId, "请选择要转移到的部门"); @@ -638,7 +638,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1()); // 更新组织架构图 - // TODO new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run(); + // new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run(); } // 更新EC部门 updateEcDepartment(deptById); @@ -651,7 +651,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //// 更新人员组织架构图 //List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString()); //for (Long hrmResourceId : hrmResourceIds) { - //TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); + // new HrmResourceTriggerRunnable(hrmResourceId).run(); //} forbiddenChildTag(deptById.getSubCompanyId1(), deptList); // 递归更新下级部门、岗位 @@ -672,7 +672,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService updateEcDepartment(departmentPO); // 更新组织架构图 - // TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); + // new DepartmentTriggerRunnable(departmentPO.getId()).run(); // 刷新岗位所属分部 //refreshJobComp(departmentPO.getId(), subCompanyId1); // 更新当前部门下的人员 @@ -682,7 +682,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString()); //// 更新人员组织架构图 //for (Long hrmResourceId : hrmResourceIds) { - //TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); + // new HrmResourceTriggerRunnable(hrmResourceId).run(); //} List childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId()); forbiddenChildTag(subCompanyId1, childList); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 5fb5b489..e6ea51a2 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -446,7 +446,7 @@ public class JobServiceImpl extends Service implements JobService { jobById.setShowOrder(orderNum); insertCount += getJobMapper().insertIgnoreNull(jobById); // 更新组织架构图 - //TODO new JobTriggerRunnable(jobById.getId()).run(); + // new JobTriggerRunnable(jobById.getId()).run(); } return insertCount; @@ -567,14 +567,14 @@ public class JobServiceImpl extends Service implements JobService { // 更新合并后的岗位，更新组织架构图 // updateEcJob(targetJob, mergeParam.getMergeName()); - // TODO targetJob.setJobName(mergeParam.getMergeName()); + // targetJob.setJobName(mergeParam.getMergeName()); getJobMapper().updateBaseJob(targetJob); - //TODO 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())); // 更新组织架构图 - //TODO new JobTriggerRunnable(jobById).run(); + // new JobTriggerRunnable(jobById).run(); return updateCount; } @@ -614,7 +614,7 @@ public class JobServiceImpl extends Service implements JobService { // 更新人员信息 // updateResourceJob(job); // 更新组织架构图 - //TODO new JobTriggerRunnable(job.getId()).run(); + // new JobTriggerRunnable(job.getId()).run(); // 递归处理子级元素 List jobsByPid = getJobMapper().getJobsByPid(job.getId()); diff --git a/src/com/engine/organization/service/impl/OrgVirtualServiceImpl.java b/src/com/engine/organization/service/impl/OrgVirtualServiceImpl.java index 9cdbfa1c..efae055c 100644 --- a/src/com/engine/organization/service/impl/OrgVirtualServiceImpl.java +++ b/src/com/engine/organization/service/impl/OrgVirtualServiceImpl.java @@ -8,7 +8,6 @@ import java.util.Map; /** * @Author liang.cheng * @Date 2023/6/27 3:45 PM - * @Description: TODO * @Version 1.0 */ public class OrgVirtualServiceImpl extends Service implements OrgVirtualService { diff --git a/src/com/engine/organization/thread/OrganizationSyncEc.java b/src/com/engine/organization/thread/OrganizationSyncEc.java index f6e47e88..a431a1a6 100644 --- a/src/com/engine/organization/thread/OrganizationSyncEc.java +++ b/src/com/engine/organization/thread/OrganizationSyncEc.java @@ -180,7 +180,6 @@ public class OrganizationSyncEc { * 封存、解封分部 */ private void cancelCompany() { - // TODO String forbiddenTag = Util.null2String(params.get("forbiddenTag")); if ("0".equals(forbiddenTag)) { // 解封 diff --git a/src/com/engine/organization/util/saveimport/CompanyImport.java b/src/com/engine/organization/util/saveimport/CompanyImport.java index 66b8854d..ff03b819 100644 --- a/src/com/engine/organization/util/saveimport/CompanyImport.java +++ b/src/com/engine/organization/util/saveimport/CompanyImport.java @@ -251,7 +251,7 @@ public class CompanyImport { Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, map, false).sync(); if (OrgImportUtil.isThrowError(syncMap)) { // 刷新组织架构图 - //TODO new CompanyTriggerRunnable(infoParams.getId()).run(); + // new CompanyTriggerRunnable(infoParams.getId()).run(); historyDetailPO.setOperateDetail("添加成功"); historyDetailPO.setStatus("1"); } else { @@ -274,7 +274,7 @@ public class CompanyImport { Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map, false).sync(); if (OrgImportUtil.isThrowError(syncMap)) { // 刷新组织架构图 - //TODO new CompanyTriggerRunnable(companyId).run(); + // new CompanyTriggerRunnable(companyId).run(); historyDetailPO.setOperateDetail("更新成功"); historyDetailPO.setStatus("1"); } else { diff --git a/src/com/engine/organization/util/saveimport/DepartmentImport.java b/src/com/engine/organization/util/saveimport/DepartmentImport.java index 6f05cd62..756741c7 100644 --- a/src/com/engine/organization/util/saveimport/DepartmentImport.java +++ b/src/com/engine/organization/util/saveimport/DepartmentImport.java @@ -311,7 +311,7 @@ public class DepartmentImport { Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, map, false).sync(); if (OrgImportUtil.isThrowError(syncMap)) { // 刷新组织架构图 - //TODO new DepartmentTriggerRunnable(departmentId).run(); + // new DepartmentTriggerRunnable(departmentId).run(); historyDetailPO.setOperateDetail("更新成功"); historyDetailPO.setStatus("1"); } else { diff --git a/src/com/engine/organization/web/OrgVirtualController.java b/src/com/engine/organization/web/OrgVirtualController.java index 61ad0497..ccc89614 100644 --- a/src/com/engine/organization/web/OrgVirtualController.java +++ b/src/com/engine/organization/web/OrgVirtualController.java @@ -19,7 +19,6 @@ import java.util.Map; /** * @Author liang.cheng * @Date 2023/6/27 3:41 PM - * @Description: TODO * @Version 1.0 */ public class OrgVirtualController { diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 718ca48d..fecae1d5 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -167,7 +167,7 @@ public class JobWrapper extends OrganizationWrapper { }.getClass(), jobById.getJobNo(), JSON.toJSONString(params), jobById, newJobById); // 更新组织架构图 - //TODO new Thread(new JobTriggerRunnable(jobById, newJobById)).start(); + // new Thread(new JobTriggerRunnable(jobById, newJobById)).start(); return updateForbiddenTagById; } @@ -185,7 +185,7 @@ public class JobWrapper extends OrganizationWrapper { writeOperateLog(new Object() { }.getClass(), jobPO.getJobTitleName(), JSON.toJSONString(ids), "删除岗位"); // 更新组织架构图 - // TODO new JobTriggerRunnable(jobPO).run(); + // new JobTriggerRunnable(jobPO).run(); } return deleteByIds; } diff --git a/src/com/engine/organization/wrapper/OrgVirtualWrapper.java b/src/com/engine/organization/wrapper/OrgVirtualWrapper.java index 88e1e5e2..2b3c88b4 100644 --- a/src/com/engine/organization/wrapper/OrgVirtualWrapper.java +++ b/src/com/engine/organization/wrapper/OrgVirtualWrapper.java @@ -11,7 +11,6 @@ import java.util.Map; /** * @Author liang.cheng * @Date 2023/6/27 3:42 PM - * @Description: TODO * @Version 1.0 */ public class OrgVirtualWrapper extends Service {