From b1d506cf15ee31603cd1ceba3473ffaa8b932f6b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 17 Aug 2023 17:17:59 +0800 Subject: [PATCH] 11 --- src/com/engine/organization/entity/TreeData.java | 1 + .../mapper/detach/ManagerDetachMapper.java | 2 ++ .../mapper/detach/ManagerDetachMapper.xml | 9 +++++++++ .../organization/mapper/scheme/SchemeMapper.java | 3 +++ .../organization/mapper/scheme/SchemeMapper.xml | 10 ++++++++++ .../organization/service/ManagerDetachService.java | 11 +++++++++++ .../service/impl/ManagerDetachServiceImpl.java | 13 +++++++++---- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/TreeData.java b/src/com/engine/organization/entity/TreeData.java index d50a16c7..e9e959b1 100644 --- a/src/com/engine/organization/entity/TreeData.java +++ b/src/com/engine/organization/entity/TreeData.java @@ -21,5 +21,6 @@ public class TreeData { private String title; private String key; private Integer status; + private Integer schemeId; private ArrayList children; } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java index df66bdb6..258114c1 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java @@ -25,4 +25,6 @@ public interface ManagerDetachMapper { ManagerDetachPO getDetachById(@Param("id") Integer id); List getDetachListById(@Param("ecManager") Integer ecManager); + + ManagerDetachPO selectManagerDetachByUid(@Param("uid") Integer uId); } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml index b4961070..c3c41703 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml @@ -217,4 +217,13 @@ WHERE delete_type = 0 and ec_manager = #{ecManager} + + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index cfec77e8..04418164 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -98,4 +98,7 @@ public interface SchemeMapper { ArrayList getTreeData(); List getSchemesByIds(@Param("ids")Collection ids); + + + List selectBySubcompanyId(@Param("subCompanyIds") Collection subCompanyIds); } diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index 6b3dea49..2b50724b 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -247,4 +247,14 @@ + + \ No newline at end of file diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java index 2a8619e3..0614c70d 100644 --- a/src/com/engine/organization/service/ManagerDetachService.java +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.engine.organization.entity.detach.param.ManagerDetachParam; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -53,4 +54,14 @@ public interface ManagerDetachService { * @param isDetach */ String doDetach(String isDetach); + + + /** + * @Description: 获取可管理的分部集合 + * @Author: liang.cheng + * @Date: 2023/8/17 4:47 PM + * @param: [] + * @return: java.util.List + */ + List selectManagerDetachByUid(); } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 6d0f3808..f72f64c2 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -46,10 +46,6 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return MapperProxyFactory.getProxy(ManagerDetachMapper.class); } - public ResourceMapper getResourceMapper() { - return MapperProxyFactory.getProxy(ResourceMapper.class); - } - public EmployeeMapper getEmployeeMapper() { return MapperProxyFactory.getProxy(EmployeeMapper.class); } @@ -155,6 +151,15 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return new BaseBean().getPropValue("hrmOrganization", "detach"); } + @Override + public List selectManagerDetachByUid() { + ManagerDetachPO managerDetach = getMangeDetachMapper().selectManagerDetachByUid(user.getUID()); + List subCompanyIds = Arrays.stream(managerDetach.getEcRolelevel().split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + return subCompanyIds; + } + private String buildSqlWhere(Map params) { DBType dbType = DBType.get(new RecordSet().getDBType()); String sqlWhere = " where delete_type = 0";