From b7938cfb6b5ac53a5a5a6e6a6b62eab3cc2501af Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 20 Dec 2022 18:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 7 ++++++- .../mapper/employee/EmployeeMapper.java | 4 ++-- .../mapper/employee/EmployeeMapper.xml | 5 ++++- .../service/impl/DepartmentServiceImpl.java | 4 ++-- .../transmethod/ManagerDetachTransMethod.java | 15 ++++++++++++--- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 78370d1d..9468c5c9 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -162,7 +162,12 @@ public class DepartmentBO { if (StringUtils.isBlank(departmentPrincipal)) { return ""; } - return MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(Long.parseLong(departmentPrincipal)); + List collect = Arrays.stream(departmentPrincipal.split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(collect)) { + return ""; + } + List employeeNameById = MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(collect); + return StringUtils.join(employeeNameById, ","); } diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.java b/src/com/engine/organization/mapper/employee/EmployeeMapper.java index 004a2077..158d2ee4 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.java +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.java @@ -15,12 +15,12 @@ import java.util.Map; **/ public interface EmployeeMapper { - String getEmployeeNameById(@Param("employeeId") Long id); + List getEmployeeNameById(@Param("ids") Collection ids); List getResourceIds(@Param("lastName") String lastName); List getResourceIdsByName(@Param("lastName") String lastName); - List> getBrowserDatas(@Param("ids") Collection ids); + List> getBrowserDatas(@Param("ids") Collection ids); } diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml index 99d1dcd3..78cdb7e9 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml @@ -21,7 +21,10 @@ diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index a5ff62ff..955c0b36 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -543,8 +543,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); } // 查询该部门一级岗位、更新岗位所属分部、所属部门 - List firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId()); - firstChildJobList = firstChildJobList.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList()); + //List firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId()); + //firstChildJobList = firstChildJobList.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList()); // 批量更新部门、所属分部 RecordSet rs = new RecordSet(); String targetEcDeptId = targetDepartment.getId().toString(); diff --git a/src/com/engine/organization/transmethod/ManagerDetachTransMethod.java b/src/com/engine/organization/transmethod/ManagerDetachTransMethod.java index 7ad97512..330f8c65 100644 --- a/src/com/engine/organization/transmethod/ManagerDetachTransMethod.java +++ b/src/com/engine/organization/transmethod/ManagerDetachTransMethod.java @@ -5,8 +5,10 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.employee.EmployeeMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.util.db.MapperProxyFactory; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -20,8 +22,15 @@ import java.util.stream.Collectors; public class ManagerDetachTransMethod { public static String getManagerName(String ecManager) { - String managerName = MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(Long.valueOf(ecManager)); - return managerName; + if (org.apache.commons.lang.StringUtils.isBlank(ecManager)) { + return ""; + } + List collect = Arrays.stream(ecManager.split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(collect)) { + return ""; + } + List employeeNameById = MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(collect); + return StringUtils.join(employeeNameById, ","); }