|
|
|
|
@ -122,6 +122,9 @@ public class OrganizeAdministratorController extends SuperController<OrganizeAdm
|
|
|
|
|
return ActionResult.success("保存成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取
|
|
|
|
|
*
|
|
|
|
|
@ -947,4 +950,760 @@ public class OrganizeAdministratorController extends SuperController<OrganizeAdm
|
|
|
|
|
}
|
|
|
|
|
parentIdInList(modulePermissionList, tempModule, allModuleSelectorVOList, moduleSelectorModel, moduleSelectorModels);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 申请入住获取组织下拉框列表
|
|
|
|
|
*
|
|
|
|
|
* @param userId 用户id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "申请入住获取组织下拉框列表")
|
|
|
|
|
@SaCheckPermission(value = {"permission.grades"})
|
|
|
|
|
@GetMapping("/Selectors")
|
|
|
|
|
public OrganizeAdministratorSelectedVO getSelectors(String userId) {
|
|
|
|
|
// if (StringUtil.isNotEmpty(userId)) {
|
|
|
|
|
// if (userId.equals(UserProvider.getLoginUserId())) {
|
|
|
|
|
// return ActionResult.fail("无法设置当前用户为分级管理员");
|
|
|
|
|
// }
|
|
|
|
|
// UserEntity userEntity = userService.getInfo(userId);
|
|
|
|
|
// if (userEntity != null && Objects.equals(userEntity.getIsAdministrator(), 1)) {
|
|
|
|
|
// return ActionResult.fail("无法设置超管为分级管理员");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
OrganizeAdministratorSelectedVO vo = new OrganizeAdministratorSelectedVO();
|
|
|
|
|
List<SystemSelectorVO> systemPermissionList = new ArrayList<>();
|
|
|
|
|
List<ModuleSelectorVO> moduleVOPermissionList = new ArrayList<>();
|
|
|
|
|
List<ModuleSelectorModel> modulePermissionList = new ArrayList<>();
|
|
|
|
|
List<String> moduleSelectedList = new ArrayList<>();
|
|
|
|
|
List<String> systemSelectedList = new ArrayList<>();
|
|
|
|
|
// 存储组织集合
|
|
|
|
|
List<OrganizeEntity> organizeList = organizeService.getList(false);
|
|
|
|
|
// 获取所有组织
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> selectorModels = JsonUtil.getJsonToList(organizeList, OrganizeAdministratorSelectorModel.class);
|
|
|
|
|
// 获取应用列表
|
|
|
|
|
List<SystemEntity> list = systemApi.getList(null, false, true, true, false);
|
|
|
|
|
List<SystemSelectorVO> systemSelectorVOList = JsonUtil.getJsonToList(list, SystemSelectorVO.class);
|
|
|
|
|
systemSelectorVOList.forEach(t -> t.setIsPermission(0));
|
|
|
|
|
// 菜单
|
|
|
|
|
SystemEntity mainSystem = systemApi.getInfoByEnCode(JnpfConst.MAIN_SYSTEM_CODE);
|
|
|
|
|
List<ModuleEntity> mainModule = moduleApi.getMainModule();
|
|
|
|
|
List<ModuleEntity> allModule = new ArrayList<>(mainModule);
|
|
|
|
|
List<ModuleSelectorModel> moduleSelectorVOList = JsonUtil.getJsonToList(mainModule, ModuleSelectorModel.class);
|
|
|
|
|
List<ModuleSelectorModel> allModuleSelectorVOList = JsonUtil.getJsonToList(allModule, ModuleSelectorModel.class);
|
|
|
|
|
|
|
|
|
|
boolean isAdministrator = userProvider.get().getIsAdministrator();
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
selectorModels.forEach(t -> {
|
|
|
|
|
// 设置组织id
|
|
|
|
|
t.setOrganizeId(t.getId());
|
|
|
|
|
t.setThisLayerAdd(0);
|
|
|
|
|
t.setThisLayerEdit(0);
|
|
|
|
|
t.setThisLayerDelete(0);
|
|
|
|
|
t.setThisLayerSelect(0);
|
|
|
|
|
t.setSubLayerAdd(0);
|
|
|
|
|
t.setSubLayerEdit(0);
|
|
|
|
|
t.setSubLayerDelete(0);
|
|
|
|
|
t.setSubLayerSelect(0);
|
|
|
|
|
});
|
|
|
|
|
moduleSelectorVOList.forEach(t -> t.setIsPermission(0));
|
|
|
|
|
} else {
|
|
|
|
|
List<OrganizeAdministratorEntity> organizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(UserProvider.getLoginUserId(), jnpf.constant.PermissionConst.ORGANIZE, false);
|
|
|
|
|
List<OrganizeAdministratorEntity> organizeAdministratorEntitys = new ArrayList<>(organizeAdministratorEntity);
|
|
|
|
|
// 处理子组织权限
|
|
|
|
|
organizeAdministratorEntitys.forEach(t -> {
|
|
|
|
|
if (t.getSubLayerSelect() != null && t.getSubLayerSelect() == 1) {
|
|
|
|
|
// 得到组织id
|
|
|
|
|
List<String> underOrganizations = organizeService.getUnderOrganizations(t.getOrganizeId(), false);
|
|
|
|
|
underOrganizations.forEach(uo -> {
|
|
|
|
|
OrganizeAdministratorEntity organizeAdministratorEntity1 = organizeAdministratorEntity.stream().filter(oae -> uo.equals(oae.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorEntity1 != null) {
|
|
|
|
|
organizeAdministratorEntity1.setThisLayerSelect(1);
|
|
|
|
|
organizeAdministratorEntity1.setSubLayerSelect(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
if (t.getSubLayerAdd() != null && t.getSubLayerAdd() == 1) {
|
|
|
|
|
underOrganizations.forEach(uo -> {
|
|
|
|
|
OrganizeAdministratorEntity organizeAdministratorEntity1 = organizeAdministratorEntity.stream().filter(oae -> uo.equals(oae.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorEntity1 != null) {
|
|
|
|
|
organizeAdministratorEntity1.setThisLayerAdd(1);
|
|
|
|
|
organizeAdministratorEntity1.setSubLayerAdd(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
if (t.getSubLayerEdit() != null && t.getSubLayerEdit() == 1) {
|
|
|
|
|
underOrganizations.forEach(uo -> {
|
|
|
|
|
OrganizeAdministratorEntity organizeAdministratorEntity1 = organizeAdministratorEntity.stream().filter(oae -> uo.equals(oae.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorEntity1 != null) {
|
|
|
|
|
organizeAdministratorEntity1.setThisLayerEdit(1);
|
|
|
|
|
organizeAdministratorEntity1.setSubLayerEdit(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
if (t.getSubLayerDelete() != null && t.getSubLayerDelete() == 1) {
|
|
|
|
|
underOrganizations.forEach(uo -> {
|
|
|
|
|
OrganizeAdministratorEntity organizeAdministratorEntity1 = organizeAdministratorEntity.stream().filter(oae -> uo.equals(oae.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorEntity1 != null) {
|
|
|
|
|
organizeAdministratorEntity1.setThisLayerDelete(1);
|
|
|
|
|
organizeAdministratorEntity1.setSubLayerDelete(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> selectorModelss = new ArrayList<>(16);
|
|
|
|
|
selectorModels.forEach(t -> {
|
|
|
|
|
// 设置组织id
|
|
|
|
|
t.setOrganizeId(t.getId());
|
|
|
|
|
OrganizeAdministratorEntity administratorEntity = organizeAdministratorEntity.stream().filter(tt -> t.getOrganizeId().equals(tt.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (administratorEntity != null) {
|
|
|
|
|
boolean flag = false;
|
|
|
|
|
if (administratorEntity.getThisLayerSelect() != null && administratorEntity.getThisLayerSelect() == 1) {
|
|
|
|
|
t.setThisLayerSelect(0);
|
|
|
|
|
flag = true;
|
|
|
|
|
if (administratorEntity.getThisLayerAdd() == 1) {
|
|
|
|
|
t.setThisLayerAdd(0);
|
|
|
|
|
}
|
|
|
|
|
if (administratorEntity.getThisLayerEdit() == 1) {
|
|
|
|
|
t.setThisLayerEdit(0);
|
|
|
|
|
}
|
|
|
|
|
if (administratorEntity.getThisLayerDelete() == 1) {
|
|
|
|
|
t.setThisLayerDelete(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (administratorEntity.getSubLayerSelect()!= null && administratorEntity.getSubLayerSelect() == 1) {
|
|
|
|
|
t.setSubLayerSelect(0);
|
|
|
|
|
flag = true;
|
|
|
|
|
if (administratorEntity.getSubLayerAdd()!= null && administratorEntity.getSubLayerAdd() == 1) {
|
|
|
|
|
t.setSubLayerAdd(0);
|
|
|
|
|
}
|
|
|
|
|
if (administratorEntity.getSubLayerEdit()!= null && administratorEntity.getSubLayerEdit() == 1) {
|
|
|
|
|
t.setSubLayerEdit(0);
|
|
|
|
|
}
|
|
|
|
|
if (administratorEntity.getSubLayerDelete()!= null && administratorEntity.getSubLayerDelete() == 1) {
|
|
|
|
|
t.setSubLayerDelete(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (flag) {
|
|
|
|
|
selectorModelss.add(t);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
selectorModels = selectorModelss;
|
|
|
|
|
|
|
|
|
|
List<OrganizeAdministratorEntity> moduleOrganizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(UserProvider.getLoginUserId(), jnpf.constant.PermissionConst.MODULE, false);
|
|
|
|
|
List<String> moduleIds = moduleOrganizeAdministratorEntity.stream().map(OrganizeAdministratorEntity::getOrganizeId).collect(Collectors.toList());
|
|
|
|
|
List<ModuleEntity> moduleByIds = moduleApi.getModuleByIds(moduleIds);
|
|
|
|
|
List<ModuleSelectorModel> moduleSelectorVOLists = JsonUtil.getJsonToList(moduleByIds, ModuleSelectorModel.class);
|
|
|
|
|
moduleSelectorVOList = moduleSelectorVOLists;
|
|
|
|
|
|
|
|
|
|
// List<OrganizeAdministratorEntity> systemOrganizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(UserProvider.getLoginUserId(), true, PermissionConst.SYSTEM);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
// 判断是否为空
|
|
|
|
|
if (StringUtil.isNotEmpty(userId)) {
|
|
|
|
|
List<OrganizeAdministratorEntity> organizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(userId, jnpf.constant.PermissionConst.ORGANIZE, false);
|
|
|
|
|
// 处理子组织字段
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> finalSelectorModels3 = selectorModels;
|
|
|
|
|
organizeAdministratorEntity.forEach(t -> {
|
|
|
|
|
if (!isAdministrator) {
|
|
|
|
|
if (t.getSubLayerSelect() != null && t.getSubLayerSelect() == 1) {
|
|
|
|
|
// 得到组织id
|
|
|
|
|
List<String> underOrganizations = organizeService.getUnderOrganizations(t.getOrganizeId(), false);
|
|
|
|
|
// 将同样的组织id的数据先处理好
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> collect1 = finalSelectorModels3.stream().filter(fsm -> underOrganizations.contains(fsm.getOrganizeId())).collect(Collectors.toList());
|
|
|
|
|
collect1.forEach(cl -> {
|
|
|
|
|
OrganizeAdministratorSelectorModel organizeAdministratorSelectorModel = finalSelectorModels3.stream().filter(fms -> fms.getOrganizeId().equals(cl.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorSelectorModel != null) {
|
|
|
|
|
if (organizeAdministratorSelectorModel.getThisLayerSelect() != null && organizeAdministratorSelectorModel.getThisLayerSelect() == 0) {
|
|
|
|
|
organizeAdministratorSelectorModel.setThisLayerSelect(0);
|
|
|
|
|
} else {
|
|
|
|
|
organizeAdministratorSelectorModel.setThisLayerSelect(3);
|
|
|
|
|
}
|
|
|
|
|
if (organizeAdministratorSelectorModel.getSubLayerSelect() != null && organizeAdministratorSelectorModel.getSubLayerSelect() == 0) {
|
|
|
|
|
organizeAdministratorSelectorModel.setSubLayerSelect(0);
|
|
|
|
|
} else {
|
|
|
|
|
organizeAdministratorSelectorModel.setSubLayerSelect(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
// 当前模型包含组织id
|
|
|
|
|
List<String> collect = underOrganizations.stream().filter(uo -> !finalSelectorModels3.stream().map(OrganizeAdministratorSelectorModel::getOrganizeId).collect(Collectors.toList()).contains(uo)).collect(Collectors.toList());
|
|
|
|
|
collect.forEach(cl -> {
|
|
|
|
|
OrganizeAdministratorEntity organizeAdministratorEntity1 = organizeAdministratorEntity.stream().filter(oa -> oa.getOrganizeId().equals(cl)).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorEntity1 != null) {
|
|
|
|
|
OrganizeEntity info = organizeService.getInfo(organizeAdministratorEntity1.getOrganizeId());
|
|
|
|
|
OrganizeAdministratorSelectorModel organizeAdministratorSelectorModel = JsonUtil.getJsonToBean(info, OrganizeAdministratorSelectorModel.class);
|
|
|
|
|
organizeAdministratorSelectorModel.setOrganizeId(organizeAdministratorEntity1.getOrganizeId());
|
|
|
|
|
organizeAdministratorSelectorModel.setThisLayerSelect(3);
|
|
|
|
|
organizeAdministratorSelectorModel.setSubLayerSelect(3);
|
|
|
|
|
finalSelectorModels3.add(organizeAdministratorSelectorModel);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> finalSelectorModels = new ArrayList<>(selectorModels);
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> finalSelectorModels1 = new ArrayList<>(selectorModels);
|
|
|
|
|
organizeAdministratorEntity.forEach(t -> {
|
|
|
|
|
// 我没有他有时，需要判断此组织是否跟我所管理的组织相同，不同则需要放进去
|
|
|
|
|
OrganizeAdministratorSelectorModel organizeAdministratorSelectorModel = finalSelectorModels.stream().filter(selectorModel -> selectorModel.getOrganizeId().equals(t.getOrganizeId())).findFirst().orElse(null);
|
|
|
|
|
if (organizeAdministratorSelectorModel == null) {
|
|
|
|
|
boolean flag = false;
|
|
|
|
|
if (t.getThisLayerSelect() != null) {
|
|
|
|
|
if (t.getThisLayerSelect() == 1) {
|
|
|
|
|
t.setThisLayerSelect(2);
|
|
|
|
|
flag = true;
|
|
|
|
|
if (flag && t.getThisLayerAdd() != null && t.getThisLayerAdd() == 1) {
|
|
|
|
|
t.setThisLayerAdd(2);
|
|
|
|
|
} else if (t.getThisLayerAdd() != null) {
|
|
|
|
|
t.setThisLayerAdd(null);
|
|
|
|
|
}
|
|
|
|
|
if (flag && t.getThisLayerEdit() != null && t.getThisLayerEdit() == 1) {
|
|
|
|
|
t.setThisLayerEdit(2);
|
|
|
|
|
} else if (t.getThisLayerEdit() != null) {
|
|
|
|
|
t.setThisLayerEdit(null);
|
|
|
|
|
}
|
|
|
|
|
if (flag && t.getThisLayerDelete() != null && t.getThisLayerDelete() == 1) {
|
|
|
|
|
t.setThisLayerDelete(2);
|
|
|
|
|
} else if (t.getThisLayerDelete() != null) {
|
|
|
|
|
t.setThisLayerDelete(null);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
t.setThisLayerSelect(null);
|
|
|
|
|
t.setThisLayerAdd(null);
|
|
|
|
|
t.setThisLayerEdit(null);
|
|
|
|
|
t.setThisLayerDelete(null);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
boolean flag1 = false;
|
|
|
|
|
if (t.getSubLayerSelect() != null) {
|
|
|
|
|
if (t.getSubLayerSelect() == 1) {
|
|
|
|
|
t.setSubLayerSelect(2);
|
|
|
|
|
flag1 = true;
|
|
|
|
|
if (flag1 && t.getSubLayerAdd() != null && t.getSubLayerAdd() == 1) {
|
|
|
|
|
t.setSubLayerAdd(2);
|
|
|
|
|
} else if (t.getSubLayerAdd() != null) {
|
|
|
|
|
t.setSubLayerAdd(null);
|
|
|
|
|
}
|
|
|
|
|
if (flag1 && t.getSubLayerEdit() != null && t.getSubLayerEdit() == 1) {
|
|
|
|
|
t.setSubLayerEdit(2);
|
|
|
|
|
} else if (t.getSubLayerEdit() != null) {
|
|
|
|
|
t.setSubLayerEdit(null);
|
|
|
|
|
}
|
|
|
|
|
if (flag1 && t.getSubLayerDelete() != null && t.getSubLayerDelete() == 1) {
|
|
|
|
|
t.setSubLayerDelete(2);
|
|
|
|
|
} else if (t.getSubLayerDelete() != null) {
|
|
|
|
|
t.setSubLayerDelete(null);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
t.setSubLayerSelect(null);
|
|
|
|
|
t.setSubLayerAdd(null);
|
|
|
|
|
t.setSubLayerEdit(null);
|
|
|
|
|
t.setSubLayerDelete(null);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (flag || flag1) {
|
|
|
|
|
OrganizeAdministratorSelectorModel jsonToBean = JsonUtil.getJsonToBean(t, OrganizeAdministratorSelectorModel.class);
|
|
|
|
|
OrganizeEntity info = organizeService.getInfo(t.getOrganizeId());
|
|
|
|
|
if (info != null) {
|
|
|
|
|
jsonToBean.setParentId(info.getParentId());
|
|
|
|
|
jsonToBean.setId(info.getId());
|
|
|
|
|
jsonToBean.setCategory(info.getCategory());
|
|
|
|
|
jsonToBean.setIcon(jnpf.constant.PermissionConst.COMPANY.equals(info.getCategory()) ? "icon-ym icon-ym-tree-organization3" : "icon-ym icon-ym-tree-department1");
|
|
|
|
|
jsonToBean.setOrganizeId(t.getOrganizeId());
|
|
|
|
|
jsonToBean.setOrganizeIdTree(info.getOrganizeIdTree());
|
|
|
|
|
jsonToBean.setFullName(info.getFullName());
|
|
|
|
|
finalSelectorModels1.add(jsonToBean);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
organizeAdministratorEntity.forEach(t -> {
|
|
|
|
|
finalSelectorModels1.forEach(fs -> {
|
|
|
|
|
if (t.getOrganizeId().equals(fs.getOrganizeId())) {
|
|
|
|
|
// 本层添加
|
|
|
|
|
if (fs.getThisLayerAdd() != null) {
|
|
|
|
|
if (fs.getThisLayerAdd() == 0) {
|
|
|
|
|
if (t.getThisLayerAdd() != null) {
|
|
|
|
|
if (t.getThisLayerAdd() == 1) {
|
|
|
|
|
fs.setThisLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerAdd(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getThisLayerAdd() == 3) {
|
|
|
|
|
if (t.getThisLayerAdd() != null) {
|
|
|
|
|
if (t.getThisLayerAdd() == 1) {
|
|
|
|
|
fs.setThisLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerAdd(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerAdd() != null) {
|
|
|
|
|
if (t.getThisLayerAdd() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerAdd(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerAdd() != null) {
|
|
|
|
|
if (t.getThisLayerAdd() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerAdd(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 本层编辑
|
|
|
|
|
if (fs.getThisLayerEdit() != null) {
|
|
|
|
|
if (fs.getThisLayerEdit() == 0) {
|
|
|
|
|
if (t.getThisLayerEdit() != null) {
|
|
|
|
|
if (t.getThisLayerEdit() == 1) {
|
|
|
|
|
fs.setThisLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerEdit(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getThisLayerEdit() == 3) {
|
|
|
|
|
if (t.getThisLayerEdit() != null) {
|
|
|
|
|
if (t.getThisLayerEdit() == 1) {
|
|
|
|
|
fs.setThisLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerEdit(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerEdit() != null) {
|
|
|
|
|
if (t.getThisLayerEdit() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerEdit(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerEdit() != null) {
|
|
|
|
|
if (t.getThisLayerEdit() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerEdit(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 本层删除
|
|
|
|
|
if (fs.getThisLayerDelete() != null) {
|
|
|
|
|
if (fs.getThisLayerDelete() == 0) {
|
|
|
|
|
if (t.getThisLayerDelete() != null) {
|
|
|
|
|
if (t.getThisLayerDelete() == 1) {
|
|
|
|
|
fs.setThisLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerDelete(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getThisLayerDelete() == 3) {
|
|
|
|
|
if (t.getThisLayerDelete() != null) {
|
|
|
|
|
if (t.getThisLayerDelete() == 1) {
|
|
|
|
|
fs.setThisLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerDelete(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerDelete() != null) {
|
|
|
|
|
if (t.getThisLayerDelete() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerDelete(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerDelete() != null) {
|
|
|
|
|
if (t.getThisLayerDelete() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerDelete(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 本层查看
|
|
|
|
|
if (fs.getThisLayerSelect() != null) {
|
|
|
|
|
if (fs.getThisLayerSelect() == 0) {
|
|
|
|
|
if (t.getThisLayerSelect() != null) {
|
|
|
|
|
if (t.getThisLayerSelect() == 1) {
|
|
|
|
|
fs.setThisLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerSelect(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getThisLayerSelect() == 3) {
|
|
|
|
|
if (t.getThisLayerSelect() != null) {
|
|
|
|
|
if (t.getThisLayerSelect() == 1) {
|
|
|
|
|
fs.setThisLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerSelect(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerSelect() != null) {
|
|
|
|
|
if (t.getThisLayerSelect() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerSelect(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getThisLayerSelect() != null) {
|
|
|
|
|
if (t.getThisLayerSelect() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setThisLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setThisLayerSelect(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 子层添加
|
|
|
|
|
if (fs.getSubLayerAdd() != null) {
|
|
|
|
|
if (fs.getSubLayerAdd() == 0) {
|
|
|
|
|
if (t.getSubLayerAdd() != null) {
|
|
|
|
|
if (t.getSubLayerAdd() == 1) {
|
|
|
|
|
fs.setSubLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerAdd(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getSubLayerAdd() == 3) {
|
|
|
|
|
if (t.getSubLayerAdd() != null) {
|
|
|
|
|
if (t.getSubLayerAdd() == 1) {
|
|
|
|
|
fs.setSubLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerAdd(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerAdd() != null) {
|
|
|
|
|
if (t.getSubLayerAdd() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerAdd(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerAdd() != null) {
|
|
|
|
|
if (t.getSubLayerAdd() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerAdd(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerAdd(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fs.getSubLayerEdit() != null) {
|
|
|
|
|
if (fs.getSubLayerEdit() == 0) {
|
|
|
|
|
if (t.getSubLayerEdit() != null) {
|
|
|
|
|
if (t.getSubLayerEdit() == 1) {
|
|
|
|
|
fs.setSubLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerEdit(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getSubLayerEdit() == 3) {
|
|
|
|
|
if (t.getSubLayerEdit() != null) {
|
|
|
|
|
if (t.getSubLayerEdit() == 1) {
|
|
|
|
|
fs.setSubLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerEdit(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerEdit() != null) {
|
|
|
|
|
if (t.getSubLayerEdit() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerEdit(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerEdit() != null) {
|
|
|
|
|
if (t.getSubLayerEdit() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerEdit(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerEdit(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fs.getSubLayerDelete() != null) {
|
|
|
|
|
if (fs.getSubLayerDelete() == 0) {
|
|
|
|
|
if (t.getSubLayerDelete() != null) {
|
|
|
|
|
if (t.getSubLayerDelete() == 1) {
|
|
|
|
|
fs.setSubLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerDelete(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getSubLayerDelete() == 3) {
|
|
|
|
|
if (t.getSubLayerDelete() != null) {
|
|
|
|
|
if (t.getSubLayerDelete() == 1) {
|
|
|
|
|
fs.setSubLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerDelete(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerDelete() != null) {
|
|
|
|
|
if (t.getSubLayerDelete() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerDelete(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerDelete() != null) {
|
|
|
|
|
if (t.getSubLayerDelete() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerDelete(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerDelete(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fs.getSubLayerSelect() != null) {
|
|
|
|
|
if (fs.getSubLayerSelect() == 0) {
|
|
|
|
|
if (t.getSubLayerSelect() != null) {
|
|
|
|
|
if (t.getSubLayerSelect() == 1) {
|
|
|
|
|
fs.setSubLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerSelect(0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (fs.getSubLayerSelect() == 3) {
|
|
|
|
|
if (t.getSubLayerSelect() != null) {
|
|
|
|
|
if (t.getSubLayerSelect() == 1) {
|
|
|
|
|
fs.setSubLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerSelect(3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerSelect() != null) {
|
|
|
|
|
if (t.getSubLayerSelect() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerSelect(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (t.getSubLayerSelect() != null) {
|
|
|
|
|
if (t.getSubLayerSelect() == 1) {
|
|
|
|
|
if (isAdministrator) {
|
|
|
|
|
fs.setSubLayerSelect(1);
|
|
|
|
|
} else {
|
|
|
|
|
fs.setSubLayerSelect(2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
selectorModels = finalSelectorModels1;
|
|
|
|
|
|
|
|
|
|
// 系统
|
|
|
|
|
List<OrganizeAdministratorEntity> systemOrganizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(userId, jnpf.constant.PermissionConst.SYSTEM, true);
|
|
|
|
|
List<String> systemPermissionIds = systemOrganizeAdministratorEntity.stream().map(OrganizeAdministratorEntity::getOrganizeId).collect(Collectors.toList());
|
|
|
|
|
List<String> collect = systemSelectorVOList.stream().map(SystemSelectorVO::getId).collect(Collectors.toList());
|
|
|
|
|
List<String> systemList = new ArrayList<>();
|
|
|
|
|
systemList.addAll(systemPermissionIds);
|
|
|
|
|
systemList.addAll(collect);
|
|
|
|
|
// 交集 1
|
|
|
|
|
List<String> collect1 = systemPermissionIds.stream().filter(collect::contains).collect(Collectors.toList());
|
|
|
|
|
systemList = systemList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
// 去掉交集后
|
|
|
|
|
systemList.removeAll(collect1);
|
|
|
|
|
// 我有他没有 0
|
|
|
|
|
List<String> collect2 = collect.stream().filter(systemList::contains).collect(Collectors.toList());
|
|
|
|
|
// 他有我没有 2
|
|
|
|
|
List<String> collect3 = systemPermissionIds.stream().filter(systemList::contains).collect(Collectors.toList());
|
|
|
|
|
List<SystemEntity> listByIds1 = systemApi.getListByIds(collect1);
|
|
|
|
|
List<SystemSelectorVO> systemSelectorVOList1 = JsonUtil.getJsonToList(listByIds1, SystemSelectorVO.class);
|
|
|
|
|
systemSelectorVOList1.forEach(t -> t.setIsPermission(1));
|
|
|
|
|
List<SystemEntity> listByIds2 = systemApi.getListByIds(collect2);
|
|
|
|
|
List<SystemSelectorVO> systemSelectorVOList2 = JsonUtil.getJsonToList(listByIds2, SystemSelectorVO.class);
|
|
|
|
|
systemSelectorVOList2.forEach(t -> t.setIsPermission(0));
|
|
|
|
|
List<SystemEntity> listByIds3 = systemApi.getListByIds(collect3);
|
|
|
|
|
List<SystemSelectorVO> systemSelectorVOList3 = JsonUtil.getJsonToList(listByIds3, SystemSelectorVO.class);
|
|
|
|
|
systemSelectorVOList3.forEach(t -> {
|
|
|
|
|
t.setIsPermission(2);
|
|
|
|
|
t.setDisabled(true);
|
|
|
|
|
});
|
|
|
|
|
// systemSelectedList.addAll(systemSelectorVOList1.stream().map(SystemSelectorVO::getId).collect(Collectors.toList()));
|
|
|
|
|
// systemSelectedList.addAll(systemSelectorVOList3.stream().map(SystemSelectorVO::getId).collect(Collectors.toList()));
|
|
|
|
|
|
|
|
|
|
systemSelectedList.addAll(systemSelectorVOList.stream().map(SystemSelectorVO::getId).collect(Collectors.toList()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
systemPermissionList.addAll(systemSelectorVOList1);
|
|
|
|
|
systemPermissionList.addAll(systemSelectorVOList2);
|
|
|
|
|
systemPermissionList.addAll(systemSelectorVOList3);
|
|
|
|
|
systemPermissionList = systemPermissionList.stream().sorted(Comparator.comparing(SystemSelectorVO::getSortCode).thenComparing(Comparator.comparing(SystemSelectorVO::getCreatorTime).reversed())).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 菜单
|
|
|
|
|
List<OrganizeAdministratorEntity> moduleOrganizeAdministratorEntity = organizeAdminIsTratorService.getOrganizeAdministratorEntity(userId, PermissionConst.MODULE, false);
|
|
|
|
|
List<String> modulePermissionIds = moduleOrganizeAdministratorEntity.stream().map(OrganizeAdministratorEntity::getOrganizeId).collect(Collectors.toList());
|
|
|
|
|
List<String> moduleCollect = moduleSelectorVOList.stream().map(ModuleSelectorModel::getId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
// List<ModuleSelectorModel> moduleSelectorVOListssId = moduleSelectorVOList;
|
|
|
|
|
// List<ModuleSelectorModel> moduleSelectorVOListss = moduleSelectorVOList;
|
|
|
|
|
// for (ModuleSelectorModel model:moduleSelectorVOList){
|
|
|
|
|
// model.getId();
|
|
|
|
|
// moduleSelectorVOListssId.addAll(model.getId());
|
|
|
|
|
// }
|
|
|
|
|
//申请入住先赋值所有的菜单
|
|
|
|
|
moduleSelectedList.addAll(moduleSelectorVOList.stream().map(ModuleSelectorModel::getId).collect(Collectors.toList()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<String> moduleList = new ArrayList<>();
|
|
|
|
|
moduleList.addAll(modulePermissionIds);
|
|
|
|
|
moduleList.addAll(moduleCollect);
|
|
|
|
|
// 交集 1
|
|
|
|
|
List<String> moduleCollect1 = modulePermissionIds.stream().filter(moduleCollect::contains).collect(Collectors.toList());
|
|
|
|
|
moduleList = moduleList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
// 去掉交集后
|
|
|
|
|
moduleList.removeAll(moduleCollect1);
|
|
|
|
|
// 我有他没有 0
|
|
|
|
|
List<String> moduleCollect2 = moduleCollect.stream().filter(moduleList::contains).collect(Collectors.toList());
|
|
|
|
|
// 他有我没有 2
|
|
|
|
|
List<String> moduleCollect3 = modulePermissionIds.stream().filter(moduleList::contains).collect(Collectors.toList());
|
|
|
|
|
List<ModuleEntity> moduleListByIds1 = moduleApi.getModuleByIds(moduleCollect1);
|
|
|
|
|
List<ModuleSelectorModel> moduleSelectorVOList1 = JsonUtil.getJsonToList(moduleListByIds1, ModuleSelectorModel.class);
|
|
|
|
|
moduleSelectorVOList1.forEach(t -> t.setIsPermission(1));
|
|
|
|
|
List<ModuleEntity> moduleListByIds2 = moduleApi.getModuleByIds(moduleCollect2);
|
|
|
|
|
List<ModuleSelectorModel> moduleSelectorVOList2 = JsonUtil.getJsonToList(moduleListByIds2, ModuleSelectorModel.class);
|
|
|
|
|
moduleSelectorVOList2.forEach(t -> t.setIsPermission(0));
|
|
|
|
|
List<ModuleEntity> moduleListByIds3 = moduleApi.getModuleByIds(moduleCollect3);
|
|
|
|
|
List<ModuleSelectorModel> moduleSelectorVOList3 = JsonUtil.getJsonToList(moduleListByIds3, ModuleSelectorModel.class);
|
|
|
|
|
moduleSelectorVOList3.forEach(t -> {
|
|
|
|
|
t.setIsPermission(2);
|
|
|
|
|
t.setDisabled(true);
|
|
|
|
|
});
|
|
|
|
|
modulePermissionList.addAll(moduleSelectorVOList1);
|
|
|
|
|
modulePermissionList.addAll(moduleSelectorVOList2);
|
|
|
|
|
modulePermissionList.addAll(moduleSelectorVOList3);
|
|
|
|
|
Set<ModuleSelectorModel> tempModule = new HashSet<>(modulePermissionList);
|
|
|
|
|
// 处理上级
|
|
|
|
|
List<ModuleSelectorModel> finalModulePermissionList = modulePermissionList;
|
|
|
|
|
modulePermissionList.forEach(t -> {
|
|
|
|
|
// 判断上级是否存在，不存在的话取出放入总权限列表
|
|
|
|
|
parentIdInList(finalModulePermissionList, tempModule, allModuleSelectorVOList, t, t);
|
|
|
|
|
});
|
|
|
|
|
modulePermissionList = new ArrayList<>(tempModule);
|
|
|
|
|
modulePermissionList.forEach(t -> {
|
|
|
|
|
if ("-1".equals(t.getParentId())) {
|
|
|
|
|
t.setParentId(t.getSystemId());
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
// 加入主系统
|
|
|
|
|
ModuleSelectorModel jsonToBean = JsonUtil.getJsonToBean(mainSystem, ModuleSelectorModel.class);
|
|
|
|
|
if (moduleSelectorVOList1.stream().anyMatch(t -> t.getId().equals(jsonToBean.getId()))) {
|
|
|
|
|
jsonToBean.setIsPermission(1);
|
|
|
|
|
} else if (moduleSelectorVOList2.stream().anyMatch(t -> t.getId().equals(jsonToBean.getId()))) {
|
|
|
|
|
jsonToBean.setIsPermission(0);
|
|
|
|
|
} else if (moduleSelectorVOList3.stream().anyMatch(t -> t.getId().equals(jsonToBean.getId()))) {
|
|
|
|
|
jsonToBean.setIsPermission(2);
|
|
|
|
|
jsonToBean.setDisabled(true);
|
|
|
|
|
}
|
|
|
|
|
// moduleSelectedList.addAll(moduleSelectorVOList1.stream().map(ModuleSelectorModel::getId).collect(Collectors.toList()));
|
|
|
|
|
// moduleSelectedList.addAll(moduleSelectorVOList3.stream().map(ModuleSelectorModel::getId).collect(Collectors.toList()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
jsonToBean.setType(0);
|
|
|
|
|
jsonToBean.setParentId("-1");
|
|
|
|
|
modulePermissionList.add(jsonToBean);
|
|
|
|
|
modulePermissionList = modulePermissionList.stream().sorted(Comparator.comparing(ModuleSelectorModel::getSortCode).thenComparing(Comparator.comparing(ModuleSelectorModel::getCreatorTime).reversed())).collect(Collectors.toList());
|
|
|
|
|
List<SumTree<ModuleSelectorModel>> menuList = TreeDotUtils.convertListToTreeDotFilter(modulePermissionList);
|
|
|
|
|
moduleVOPermissionList = JsonUtil.getJsonToList(menuList, ModuleSelectorVO.class);
|
|
|
|
|
} else {
|
|
|
|
|
selectorModels = new ArrayList<>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 判断断层有没有上下级关系
|
|
|
|
|
List<OrganizeAdministratorSelectorModel> finalSelectorModels2 = new ArrayList<>(selectorModels);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
selectorModels.forEach(t -> {
|
|
|
|
|
if (StringUtil.isNotEmpty(t.getOrganizeIdTree())) {
|
|
|
|
|
List<String> list1 = new ArrayList<>();
|
|
|
|
|
String[] split = t.getOrganizeIdTree().split(",");
|
|
|
|
|
list1 = Arrays.asList(split);
|
|
|
|
|
Collections.reverse(list1);
|
|
|
|
|
for (String orgId : list1) {
|
|
|
|
|
OrganizeAdministratorSelectorModel organizeEntity1 = finalSelectorModels2.stream().filter(organizeEntity -> organizeEntity.getId().equals(orgId)).findFirst().orElse(null);
|
|
|
|
|
if (organizeEntity1 != null && !organizeEntity1.getId().equals(t.getId())) {
|
|
|
|
|
t.setParentId(organizeEntity1.getId());
|
|
|
|
|
String[] split1 = t.getOrganizeIdTree().split(organizeEntity1.getId());
|
|
|
|
|
if (split1.length > 1) {
|
|
|
|
|
t.setFullName(organizeService.getFullNameByOrgIdTree(split1[1], "/"));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
selectorModels.forEach(t -> t.setIcon(StringUtil.isNotEmpty(t.getCategory()) ? "company".equals(t.getCategory()) ? "icon-ym icon-ym-tree-organization3" : "icon-ym icon-ym-tree-department1" : ""));
|
|
|
|
|
List<SumTree<OrganizeAdministratorSelectorModel>> trees = TreeDotUtils.convertListToTreeDot(selectorModels);
|
|
|
|
|
List<OrganizeAdministratorSelectorVO> listVO = JsonUtil.getJsonToList(trees, OrganizeAdministratorSelectorVO.class);
|
|
|
|
|
listVO.forEach(t -> {
|
|
|
|
|
t.setFullName(organizeService.getFullNameByOrgIdTree(t.getOrganizeIdTree(), "/"));
|
|
|
|
|
});
|
|
|
|
|
vo.setOrgAdminList(listVO);
|
|
|
|
|
vo.setSystemPermissionList(systemPermissionList);
|
|
|
|
|
vo.setModulePermissionList(moduleVOPermissionList);
|
|
|
|
|
vo.setSystemIds(systemSelectedList);
|
|
|
|
|
vo.setModuleIds(moduleSelectedList);
|
|
|
|
|
return vo;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
CJYXTX\27961
8 months ago