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 7af1439b..00296be1 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 562d19cf..648ff88a 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -266,4 +266,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 f696f328..b2ad3d36 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -176,6 +176,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";