diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp
index 9df1aac9..0ce115b9 100644
--- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp
+++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp
@@ -334,10 +334,10 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb)
     QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 ");
     if(!strLoctionFilter.isEmpty())
     {
-        sqlSequenceQuery.append(QString(" and %1 order by dev_group_no asc;").arg(strLoctionFilter));
+        sqlSequenceQuery.append(QString(" and %1 order by location_id , rtu_no , dev_group_no asc ,tag_name;").arg(strLoctionFilter));
     }else
     {
-        sqlSequenceQuery.append(QStringLiteral(" order by dev_group_no asc;"));
+        sqlSequenceQuery.append(QStringLiteral(" order by  location_id , rtu_no , dev_group_no asc ,tag_name;"));
     }
     query.setForwardOnly(true);
     pReadDb->execute(sqlSequenceQuery, query);
@@ -368,11 +368,13 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb)
         }
         strLoctionFilter = QString("(group_tag_name in ('%1'))").arg(listLocation.join("','"));
     }
-    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info");
+    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info ");
     if(!strLoctionFilter.isEmpty())
     {
-        sqlSequenceQuery.append(QString(" where %1;").arg(strLoctionFilter));
+        sqlSequenceQuery.append(QString(" where %1").arg(strLoctionFilter));
     }
+    sqlSequenceQuery.append(" order by location_id, tag_name;");
+
     query.setForwardOnly(true);
     pReadDb->execute(sqlSequenceQuery, query);
     while(query.next())