|
|
@@ -389,11 +389,13 @@ public class RoleServiceImpl extends SuperService {
|
|
|
* @param oid
|
|
|
* @return
|
|
|
*/
|
|
|
- public ResultContent<Set<String>> getOrganizationAuth(String oid) {
|
|
|
+ public ResultContent<Set<String>> getOrganizationAuth(String oid, String userId) {
|
|
|
if (StringUtils.isEmpty(oid)) {
|
|
|
oid = getCurrentOid();
|
|
|
}
|
|
|
- String userId = getCurrentUserId();
|
|
|
+ if (StringUtils.isEmpty(userId)) {
|
|
|
+ userId = getCurrentUserId();
|
|
|
+ }
|
|
|
Set<String> auth = new HashSet<>();
|
|
|
if (StringUtils.isEmpty(oid)) {
|
|
|
return ResultContent.buildSuccess(auth);
|