areaid
This commit is contained in:
parent
0c00e7949a
commit
c866ad4f41
|
|
@ -79,7 +79,7 @@ public class SysRole extends BaseEntity
|
||||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
private Long areaId;
|
private Long areaId;
|
||||||
|
|
||||||
private Long[] areaIds;
|
private String[] areaIds;
|
||||||
|
|
||||||
/** 角色菜单权限 */
|
/** 角色菜单权限 */
|
||||||
private Set<String> permissions;
|
private Set<String> permissions;
|
||||||
|
|
@ -256,11 +256,11 @@ public class SysRole extends BaseEntity
|
||||||
this.areaId = areaId;
|
this.areaId = areaId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long[] getAreaIds() {
|
public String[] getAreaIds() {
|
||||||
return areaIds;
|
return areaIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAreaIds(Long[] areaIds) {
|
public void setAreaIds(String[] areaIds) {
|
||||||
this.areaIds = areaIds;
|
this.areaIds = areaIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,7 @@ public class SysRoleArea
|
||||||
private Long roleId;
|
private Long roleId;
|
||||||
|
|
||||||
/** 区域ID */
|
/** 区域ID */
|
||||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
private String areaId;
|
||||||
private Long areaId;
|
|
||||||
|
|
||||||
public Long getRoleId()
|
public Long getRoleId()
|
||||||
{
|
{
|
||||||
|
|
@ -28,11 +27,11 @@ public class SysRoleArea
|
||||||
this.roleId = roleId;
|
this.roleId = roleId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getAreaId() {
|
public String getAreaId() {
|
||||||
return areaId;
|
return areaId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAreaId(Long areaId) {
|
public void setAreaId(String areaId) {
|
||||||
this.areaId = areaId;
|
this.areaId = areaId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -386,7 +386,7 @@ public class SysRoleServiceImpl implements ISysRoleService
|
||||||
int rows = 1;
|
int rows = 1;
|
||||||
// 新增角色与区域(数据权限)管理
|
// 新增角色与区域(数据权限)管理
|
||||||
List<SysRoleArea> list = new ArrayList<SysRoleArea>();
|
List<SysRoleArea> list = new ArrayList<SysRoleArea>();
|
||||||
for (Long areaId : role.getAreaIds())
|
for (String areaId : role.getAreaIds())
|
||||||
{
|
{
|
||||||
SysRoleArea rd = new SysRoleArea();
|
SysRoleArea rd = new SysRoleArea();
|
||||||
rd.setRoleId(role.getRoleId());
|
rd.setRoleId(role.getRoleId());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue