github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

通用查询中获取数据权限 添加对多表连接的处理 

数据权限添加级别 “本级及其下属”
pull/729/head
cm 2022-03-02 17:01:05 +08:00
parent 0705b123be
commit 516530312a
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java
View File

@ -123,7 +123,7 @@ public class DateUtil {
* @param localDateTime / * @param localDateTime /
* @return / * @return /
*/ */
public String localDateTimeFormatyMd(LocalDateTime localDateTime) { public static String localDateTimeFormatyMd(LocalDateTime localDateTime) {
return DFY_MD.format(localDateTime); return DFY_MD.format(localDateTime);
} }

10
eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
View File

@ -45,7 +45,15 @@ public class QueryHelp {
List<Long> dataScopes = SecurityUtils.getCurrentUserDataScope(); List<Long> dataScopes = SecurityUtils.getCurrentUserDataScope();
if(CollectionUtil.isNotEmpty(dataScopes)){ if(CollectionUtil.isNotEmpty(dataScopes)){
if(StringUtils.isNotBlank(permission.joinName()) && StringUtils.isNotBlank(permission.fieldName())) { if(StringUtils.isNotBlank(permission.joinName()) && StringUtils.isNotBlank(permission.fieldName())) {
Join join = root.join(permission.joinName(), JoinType.LEFT); Join join = null;
String[] joinNames = permission.joinName().split(">");
for (String name : joinNames) {
if (ObjectUtil.isNotNull(join)) {
join = join.join(name, JoinType.LEFT);
} else {
join = root.join(name, JoinType.LEFT);
}
}
list.add(getExpression(permission.fieldName(),join, root).in(dataScopes)); list.add(getExpression(permission.fieldName(),join, root).in(dataScopes));
} else if (StringUtils.isBlank(permission.joinName()) && StringUtils.isNotBlank(permission.fieldName())) { } else if (StringUtils.isBlank(permission.joinName()) && StringUtils.isNotBlank(permission.fieldName())) {
list.add(getExpression(permission.fieldName(),null, root).in(dataScopes)); list.add(getExpression(permission.fieldName(),null, root).in(dataScopes));

3
eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
View File

@ -35,6 +35,9 @@ public enum DataScopeEnum {
/* 自己部门的数据权限 */ /* 自己部门的数据权限 */
THIS_LEVEL("本级", "自己部门的数据权限"), THIS_LEVEL("本级", "自己部门的数据权限"),
/* 自己部门的数据权限 */
THIS_LEVEL_AND_SUB("本级及其下属", "自己部门及其下属部门的数据权限"),
/* 自定义的数据权限 */ /* 自定义的数据权限 */
CUSTOMIZE("自定义", "自定义的数据权限"); CUSTOMIZE("自定义", "自定义的数据权限");

2
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java
View File

@ -70,7 +70,7 @@ public class Role extends BaseEntity implements Serializable {
@ApiModelProperty(value = "名称", hidden = true) @ApiModelProperty(value = "名称", hidden = true)
private String name; private String name;
@ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义") @ApiModelProperty(value = "数据权限，全部 、 本级 、本级及其下属 、 自定义")
private String dataScope = DataScopeEnum.THIS_LEVEL.getValue(); private String dataScope = DataScopeEnum.THIS_LEVEL.getValue();
@Column(name = "level") @Column(name = "level")

7
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java
View File

@ -61,6 +61,13 @@ public class DataServiceImpl implements DataService {
case THIS_LEVEL: case THIS_LEVEL:
deptIds.add(user.getDept().getId()); deptIds.add(user.getDept().getId());
break; break;
case THIS_LEVEL_AND_SUB:
deptIds.add(user.getDept().getId());
List<Dept> deptChildren = deptService.findByPid(user.getDept().getId());
if (deptChildren != null && deptChildren.size() != 0) {
deptIds.addAll(deptService.getDeptChildren(deptChildren));
}
break;
case CUSTOMIZE: case CUSTOMIZE:
deptIds.addAll(getCustomize(deptIds, role)); deptIds.addAll(getCustomize(deptIds, role));
break; break;