liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/cl #2

Merged
liang.cheng merged 10 commits from feature/cl into develop 2025-08-14 15:03:31 +08:00
Conversation 0 Commits 10 Files Changed 214 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28aa549865 - Show all commits

4
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
View File

@ -245,9 +245,9 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
*/
public static List<Integer> getJclRoleLevels(Integer uId) {
List<Integer> ecRoleLevels = new ArrayList<>();
ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
// ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
//人员
List<ManagerDetachPO> detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId,0));
List<ManagerDetachPO> detachListById = new ArrayList<>(MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachListById(uId,0));
//角色
HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));

6
src/com/engine/organization/util/detach/DetachUtil.java
View File

@ -25,7 +25,11 @@ public class DetachUtil {
private final List<Integer> 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) {