diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 99182816..69e7740d 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -245,9 +245,9 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe */ public static List getJclRoleLevels(Integer uId) { List ecRoleLevels = new ArrayList<>(); - ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class); + // ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class); //人员 - List detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId,0)); + List detachListById = new ArrayList<>(MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachListById(uId,0)); //角色 HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); List roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(","))); diff --git a/src/com/engine/organization/util/detach/DetachUtil.java b/src/com/engine/organization/util/detach/DetachUtil.java index 12f269ef..778d33bb 100644 --- a/src/com/engine/organization/util/detach/DetachUtil.java +++ b/src/com/engine/organization/util/detach/DetachUtil.java @@ -25,7 +25,11 @@ public class DetachUtil { private final List jclRoleLevels; public DetachUtil(User user) { - if (1 == user.getUID() || user.isAdmin()) { +// if (1 == user.getUID() || user.isAdmin()) { +// DETACH = false; +// } + //分权管理员支持分权 + if (1 == user.getUID()) { DETACH = false; } if (DETACH) {