|
@@ -52,7 +52,8 @@ public class AdminRoleLogic {
|
|
if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0) || canShow) {
|
|
if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0) || canShow) {
|
|
v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
|
|
v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
|
|
.or()
|
|
.or()
|
|
- .isNull(AdminRole::getCompanyId);
|
|
|
|
|
|
+ .isNull(AdminRole::getCompanyId)
|
|
|
|
+ .or();
|
|
} else {
|
|
} else {
|
|
v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds);
|
|
v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds);
|
|
}
|
|
}
|