Merge branch 'cherry-pick-9def68c7' into 'master'

fix:获取多设备优化错误提示

See merge request yunteng/thingskit!267

@@ -371,11 +371,11 @@ public class TkDeviceController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @ApiOperation("获取多种产品下的设备")
   @ApiOperation("获取多种产品下的设备")
   public List<DeviceDTO> getListByDeviceProfileIds(
   public List<DeviceDTO> getListByDeviceProfileIds(
-          @RequestBody List<String> deviceProfileIds,
+          @RequestBody (required = false)List<String> deviceProfileIds,
            String organizationId)
            String organizationId)
           throws ThingsboardException {
           throws ThingsboardException {
     if(deviceProfileIds==null||deviceProfileIds.isEmpty()){
     if(deviceProfileIds==null||deviceProfileIds.isEmpty()){
-      throw new TkDataValidationException(ErrorMessage.BAD_PARAMETER.getMessage());
+      throw new TkDataValidationException(ErrorMessage.GET_DEVICE_lIST_ERROR.getMessage());
     }
     }
     return tkdeviceService.findDevicesByOrganizationIds(
     return tkdeviceService.findDevicesByOrganizationIds(
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentTenantId(),

@@ -116,7 +116,7 @@ public enum ErrorMessage {
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
   MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用"),
   MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用"),
   INVALID_PARAMETER_IMPORT(400068, "网关子设备产品中不允许导入服务，事件类的物模型"),
   INVALID_PARAMETER_IMPORT(400068, "网关子设备产品中不允许导入服务，事件类的物模型"),
-  DELETE_MENU_ERROR(400069, "该菜单下存在子菜单，需先删除子菜单");
+  GET_DEVICE_lIST_ERROR(400070, "请先在组态编辑页面绑定产品");
   private final int code;
   private final int code;
   private String message;
   private String message;