Browse Source

Fix checkCalculatedFieldId

pull/13285/head
ViacheslavKlimov 1 year ago
parent
commit
325c71f2ab
  1. 3
      application/src/main/java/org/thingsboard/server/controller/BaseController.java

3
application/src/main/java/org/thingsboard/server/controller/BaseController.java

@ -908,12 +908,13 @@ public abstract class BaseController {
} }
} }
private void checkCalculatedFieldId(CalculatedFieldId calculatedFieldId, Operation operation) throws ThingsboardException { private CalculatedField checkCalculatedFieldId(CalculatedFieldId calculatedFieldId, Operation operation) throws ThingsboardException {
validateId(calculatedFieldId, "Invalid entity id"); validateId(calculatedFieldId, "Invalid entity id");
SecurityUser user = getCurrentUser(); SecurityUser user = getCurrentUser();
CalculatedField cf = calculatedFieldService.findById(user.getTenantId(), calculatedFieldId); CalculatedField cf = calculatedFieldService.findById(user.getTenantId(), calculatedFieldId);
checkNotNull(cf, calculatedFieldId.getEntityType().getNormalName() + " with id [" + calculatedFieldId + "] is not found"); checkNotNull(cf, calculatedFieldId.getEntityType().getNormalName() + " with id [" + calculatedFieldId + "] is not found");
checkEntityId(cf.getEntityId(), operation); checkEntityId(cf.getEntityId(), operation);
return cf;
} }
protected HomeDashboardInfo getHomeDashboardInfo(SecurityUser securityUser, JsonNode additionalInfo) { protected HomeDashboardInfo getHomeDashboardInfo(SecurityUser securityUser, JsonNode additionalInfo) {

Loading…
Cancel
Save