Merge branch 'master' into 'master_dev'

Master

See merge request yunteng/thingskit!361

@@ -1102,12 +1102,14 @@ public class DeviceController extends BaseController {
             importedDeviceInfo.getEntity().setAdditionalInfo(objectNode);
           }
           importedDeviceInfo.getEntity().setDeviceProfileId(new DeviceProfileId(UUID.fromString(tbDeviceProfileId)));
+            Device device = importedDeviceInfo.getEntity();
+            deviceService.saveDevice(device,false);
           onDeviceCreatedOrUpdated(
               importedDeviceInfo.getEntity(),
               importedDeviceInfo.getOldEntity(),
               importedDeviceInfo.isUpdated(),
               user);
-          Device device = importedDeviceInfo.getEntity();
+
           String tenantId = user.getCurrentTenantId();
           if (Objects.equals(deviceTypeEnum, DeviceTypeEnum.SENSOR)
               && StringUtils.isNotEmpty(gateWayTbDeviceId)) {

@@ -131,8 +131,6 @@
                 AND (
                 ifd.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
                 or
-                ifd.sn LIKE concat('%',#{queryMap.name}::TEXT,'%')
-                or
                 ifd.alias LIKE concat('%',#{queryMap.name}::TEXT,'%')
                 )
             </if>