|
@@ -135,7 +135,7 @@ public class DataScopeAspect
|
|
135
|
}
|
135
|
}
|
|
136
|
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
|
136
|
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
|
|
137
|
{
|
137
|
{
|
|
138
|
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set({}, ancestors) > 0 )", deptAlias, user.getDeptId(), user.getDeptId()));
|
|
|
|
|
|
138
|
+ sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
|
|
139
|
}
|
139
|
}
|
|
140
|
else if (DATA_SCOPE_SELF.equals(dataScope))
|
140
|
else if (DATA_SCOPE_SELF.equals(dataScope))
|
|
141
|
{
|
141
|
{
|