Browse Source

changed order by created time to order by id

pull/10527/head
ShvaykaD 2 years ago
parent
commit
f1bf12e067
  1. 2
      application/src/main/data/upgrade/3.6.4/schema_update.sql
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java

2
application/src/main/data/upgrade/3.6.4/schema_update.sql

@ -26,7 +26,7 @@ $$
ALTER TABLE customer ADD COLUMN is_public boolean DEFAULT false;
UPDATE customer SET is_public = true WHERE title = 'Public';
END IF;
END
END;
$$;
-- UPDATE PUBLIC CUSTOMERS END

2
dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java

@ -51,7 +51,7 @@ public interface CustomerRepository extends JpaRepository<CustomerEntity, UUID>,
@Query(value = "SELECT c.* FROM customer c " +
"INNER JOIN (SELECT tenant_id, title FROM customer GROUP BY tenant_id, title HAVING COUNT(title) > 1) dc " +
"ON c.tenant_id = dc.tenant_id AND c.title = dc.title " +
"ORDER BY c.tenant_id, c.title, c.created_time",
"ORDER BY c.tenant_id, c.title, c.id",
nativeQuery = true)
Page<CustomerEntity> findCustomersWithTheSameTitle(Pageable pageable);

Loading…
Cancel
Save