Showing
6 changed files
with
8 additions
and
8 deletions
| @@ -135,7 +135,7 @@ public class UserController extends BaseController { | @@ -135,7 +135,7 @@ public class UserController extends BaseController { | ||
| 135 | HttpServletRequest request) throws ThingsboardException { | 135 | HttpServletRequest request) throws ThingsboardException { |
| 136 | try { | 136 | try { |
| 137 | 137 | ||
| 138 | - if (getCurrentUser().getAuthority() == Authority.TENANT_ADMIN) { | 138 | + if (Authority.TENANT_ADMIN.equals(getCurrentUser().getAuthority())) { |
| 139 | user.setTenantId(getCurrentUser().getTenantId()); | 139 | user.setTenantId(getCurrentUser().getTenantId()); |
| 140 | } | 140 | } |
| 141 | 141 |
| @@ -60,7 +60,7 @@ public class WidgetTypeController extends BaseController { | @@ -60,7 +60,7 @@ public class WidgetTypeController extends BaseController { | ||
| 60 | @ResponseBody | 60 | @ResponseBody |
| 61 | public WidgetType saveWidgetType(@RequestBody WidgetType widgetType) throws ThingsboardException { | 61 | public WidgetType saveWidgetType(@RequestBody WidgetType widgetType) throws ThingsboardException { |
| 62 | try { | 62 | try { |
| 63 | - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { | 63 | + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { |
| 64 | widgetType.setTenantId(TenantId.SYS_TENANT_ID); | 64 | widgetType.setTenantId(TenantId.SYS_TENANT_ID); |
| 65 | } else { | 65 | } else { |
| 66 | widgetType.setTenantId(getCurrentUser().getTenantId()); | 66 | widgetType.setTenantId(getCurrentUser().getTenantId()); |
| @@ -61,7 +61,7 @@ public class WidgetsBundleController extends BaseController { | @@ -61,7 +61,7 @@ public class WidgetsBundleController extends BaseController { | ||
| 61 | @ResponseBody | 61 | @ResponseBody |
| 62 | public WidgetsBundle saveWidgetsBundle(@RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException { | 62 | public WidgetsBundle saveWidgetsBundle(@RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException { |
| 63 | try { | 63 | try { |
| 64 | - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { | 64 | + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { |
| 65 | widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID); | 65 | widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID); |
| 66 | } else { | 66 | } else { |
| 67 | widgetsBundle.setTenantId(getCurrentUser().getTenantId()); | 67 | widgetsBundle.setTenantId(getCurrentUser().getTenantId()); |
| @@ -103,7 +103,7 @@ public class WidgetsBundleController extends BaseController { | @@ -103,7 +103,7 @@ public class WidgetsBundleController extends BaseController { | ||
| 103 | @RequestParam(required = false) String sortOrder) throws ThingsboardException { | 103 | @RequestParam(required = false) String sortOrder) throws ThingsboardException { |
| 104 | try { | 104 | try { |
| 105 | PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder); | 105 | PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder); |
| 106 | - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { | 106 | + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { |
| 107 | return checkNotNull(widgetsBundleService.findSystemWidgetsBundlesByPageLink(getTenantId(), pageLink)); | 107 | return checkNotNull(widgetsBundleService.findSystemWidgetsBundlesByPageLink(getTenantId(), pageLink)); |
| 108 | } else { | 108 | } else { |
| 109 | TenantId tenantId = getCurrentUser().getTenantId(); | 109 | TenantId tenantId = getCurrentUser().getTenantId(); |
| @@ -119,7 +119,7 @@ public class WidgetsBundleController extends BaseController { | @@ -119,7 +119,7 @@ public class WidgetsBundleController extends BaseController { | ||
| 119 | @ResponseBody | 119 | @ResponseBody |
| 120 | public List<WidgetsBundle> getWidgetsBundles() throws ThingsboardException { | 120 | public List<WidgetsBundle> getWidgetsBundles() throws ThingsboardException { |
| 121 | try { | 121 | try { |
| 122 | - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { | 122 | + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { |
| 123 | return checkNotNull(widgetsBundleService.findSystemWidgetsBundles(getTenantId())); | 123 | return checkNotNull(widgetsBundleService.findSystemWidgetsBundles(getTenantId())); |
| 124 | } else { | 124 | } else { |
| 125 | TenantId tenantId = getCurrentUser().getTenantId(); | 125 | TenantId tenantId = getCurrentUser().getTenantId(); |
| @@ -105,7 +105,7 @@ public class CustomerUserPermissions extends AbstractPermissions { | @@ -105,7 +105,7 @@ public class CustomerUserPermissions extends AbstractPermissions { | ||
| 105 | 105 | ||
| 106 | @Override | 106 | @Override |
| 107 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { | 107 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { |
| 108 | - if (userEntity.getAuthority() != Authority.CUSTOMER_USER) { | 108 | + if (!Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) { |
| 109 | return false; | 109 | return false; |
| 110 | } | 110 | } |
| 111 | if (!user.getId().equals(userId)) { | 111 | if (!user.getId().equals(userId)) { |
| @@ -57,7 +57,7 @@ public class SysAdminPermissions extends AbstractPermissions { | @@ -57,7 +57,7 @@ public class SysAdminPermissions extends AbstractPermissions { | ||
| 57 | 57 | ||
| 58 | @Override | 58 | @Override |
| 59 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { | 59 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { |
| 60 | - if (userEntity.getAuthority() == Authority.CUSTOMER_USER) { | 60 | + if (Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) { |
| 61 | return false; | 61 | return false; |
| 62 | } | 62 | } |
| 63 | return true; | 63 | return true; |
| @@ -76,7 +76,7 @@ public class TenantAdminPermissions extends AbstractPermissions { | @@ -76,7 +76,7 @@ public class TenantAdminPermissions extends AbstractPermissions { | ||
| 76 | 76 | ||
| 77 | @Override | 77 | @Override |
| 78 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { | 78 | public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { |
| 79 | - if (userEntity.getAuthority() == Authority.SYS_ADMIN) { | 79 | + if (Authority.SYS_ADMIN.equals(userEntity.getAuthority())) { |
| 80 | return false; | 80 | return false; |
| 81 | } | 81 | } |
| 82 | if (!user.getTenantId().equals(userEntity.getTenantId())) { | 82 | if (!user.getTenantId().equals(userEntity.getTenantId())) { |