Merge branch '20230614' into 'master_dev'

20230614 See merge request yunteng/thingskit!197

Merge branch '20230614' into 'master_dev'
20230614 See merge request yunteng/thingskit!197
xp.Huang
2 parents 10b3fc5b a0a52123
Showing 1 changed file with 1 additions and 1 deletions
application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @2be82ac
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @2be82ac
@@ -97,7 +97,7 @@ public abstract class AbstractRpcController extends BaseController {
             String additionalInfo =  JacksonUtil.toString(additional);
             String methodName = rpcRequestBody.get(FastIotConstants.Rpc.METHOD_NAME).asText();
             JsonNode params = rpcRequestBody.get(FastIotConstants.Rpc.PARAMS_NAME);
-            if(params!=null && !params.isTextual()){
+            if(DeviceTypeEnum.SENSOR == targetDevice.getDeviceType() && params!=null && !params.isTextual()){
                 ObjectNode methodParams = (ObjectNode) rpcRequestBody.get(FastIotConstants.Rpc.PARAMS_NAME);
                 methodParams.put(FastIotConstants.Rpc.TARGET_NAME,targetDevice.getName());
             }