Browse Source

refacotring to be in sync with PE

pull/14352/head
Volodymyr Babak 10 months ago
parent
commit
c5a8a874a9
  1. 8
      application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java

8
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java

@ -47,8 +47,12 @@ public abstract class BaseUserProcessor extends BaseEdgeProcessor {
} }
User userById = edgeCtx.getUserService().findUserById(tenantId, userId); User userById = edgeCtx.getUserService().findUserById(tenantId, userId);
isCreated = userById == null; if (userById == null) {
user.setId(isCreated ? null : userId); isCreated = true;
user.setId(null);
} else {
user.setId(userId);
}
String userEmail = user.getEmail(); String userEmail = user.getEmail();
User existing = edgeCtx.getUserService().findUserByTenantIdAndEmail(tenantId, user.getEmail()); User existing = edgeCtx.getUserService().findUserByTenantIdAndEmail(tenantId, user.getEmail());

Loading…
Cancel
Save