fix(资料中心): 79850
This commit is contained in:
+5
@@ -108,6 +108,11 @@ public class LawsDataCenterFolder implements Serializable {
|
|||||||
@ApiModelProperty(value = "查看权限(用户id逗号拼接) 翻译")
|
@ApiModelProperty(value = "查看权限(用户id逗号拼接) 翻译")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private java.lang.String authViewIdsDictText;
|
private java.lang.String authViewIdsDictText;
|
||||||
|
/**
|
||||||
|
* 默认根节点(1:是 0:否)
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "默认根节点(1:是 0:否)")
|
||||||
|
private java.lang.String defaultFolder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件夹顺序
|
* 文件夹顺序
|
||||||
|
|||||||
+4
-2
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.jero.common.api.vo.ResultCommon;
|
import com.jero.common.api.vo.ResultCommon;
|
||||||
|
import com.jero.common.constant.enums.YesOrNoEnum;
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.common.util.BeanCopyUtils;
|
import com.jero.common.util.BeanCopyUtils;
|
||||||
@@ -62,12 +63,13 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl<LawsDataCenterF
|
|||||||
.orderByAsc(LawsDataCenterFolder::getSort).orderByAsc(LawsDataCenterFolder::getCreateTime));
|
.orderByAsc(LawsDataCenterFolder::getSort).orderByAsc(LawsDataCenterFolder::getCreateTime));
|
||||||
List<LawsDataCenterFolder> allList = BeanCopyUtils.copyBeanList(lawsDataCenterFolderList, LawsDataCenterFolder.class);
|
List<LawsDataCenterFolder> allList = BeanCopyUtils.copyBeanList(lawsDataCenterFolderList, LawsDataCenterFolder.class);
|
||||||
|
|
||||||
// 非管理员只能看到自己创建的 or 拥有管理权限 or 拥有查看权限的文件夹
|
// 非管理员只能看到自己创建的 or 拥有管理权限 or 拥有查看权限的文件夹 or 默认根目录
|
||||||
if (!roleIds.contains("admin")){
|
if (!roleIds.contains("admin")){
|
||||||
lawsDataCenterFolderList = lawsDataCenterFolderList.stream()
|
lawsDataCenterFolderList = lawsDataCenterFolderList.stream()
|
||||||
.filter(v -> (StringUtils.isNotBlank(v.getAuthManageIds()) && v.getAuthManageIds().contains(loginUser.getId()))
|
.filter(v -> (StringUtils.isNotBlank(v.getAuthManageIds()) && v.getAuthManageIds().contains(loginUser.getId()))
|
||||||
|| (StringUtils.isNotBlank(v.getAuthViewIds()) && v.getAuthViewIds().contains(loginUser.getId()))
|
|| (StringUtils.isNotBlank(v.getAuthViewIds()) && v.getAuthViewIds().contains(loginUser.getId()))
|
||||||
|| v.getOwnerId().equals(loginUser.getId()))
|
|| v.getOwnerId().equals(loginUser.getId())
|
||||||
|
|| YesOrNoEnum.YES.getValue().equals(v.getDefaultFolder()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user