|
|
|
@ -118,10 +118,9 @@ public class DataScopeAspect
|
|
|
|
|
} |
|
|
|
|
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) |
|
|
|
|
{ |
|
|
|
|
String deptChild = user.getDept().getParentId() + "," + user.getDeptId(); |
|
|
|
|
sqlString.append(StringUtils.format( |
|
|
|
|
" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or ancestors LIKE '%{}%' )", |
|
|
|
|
deptAlias, user.getDeptId(), deptChild)); |
|
|
|
|
" OR {}.dept_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)) |
|
|
|
|
{ |
|
|
|
|