|
@@ -116,24 +116,24 @@ public class DataScopeAspect
|
|
|
else if (DATA_SCOPE_CUSTOM.equals(dataScope))
|
|
|
{
|
|
|
sqlString.append(StringUtils.format(
|
|
|
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
|
|
|
+ " OR {}.id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
|
|
|
role.getId()));
|
|
|
}
|
|
|
else if (DATA_SCOPE_DEPT.equals(dataScope))
|
|
|
{
|
|
|
- sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
|
|
|
+ sqlString.append(StringUtils.format(" OR {}.id = {} ", deptAlias, user.getDeptId()));
|
|
|
}
|
|
|
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
|
|
|
{
|
|
|
sqlString.append(StringUtils.format(
|
|
|
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
|
|
|
+ " OR {}.id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
|
|
|
deptAlias, user.getDeptId(), user.getDeptId()));
|
|
|
}
|
|
|
else if (DATA_SCOPE_SELF.equals(dataScope))
|
|
|
{
|
|
|
if (StringUtils.isNotBlank(userAlias))
|
|
|
{
|
|
|
- sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getId()));
|
|
|
+ sqlString.append(StringUtils.format(" OR {}.id = {} ", userAlias, user.getId()));
|
|
|
}
|
|
|
else
|
|
|
{
|