diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 34f07a68a..e5f448047 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -682,10 +682,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -826,10 +826,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -956,10 +956,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1059,10 +1059,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1159,10 +1159,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1260,10 +1260,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1360,10 +1360,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1455,10 +1455,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1558,10 +1558,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1661,10 +1661,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml index 4db144faf..a0987faa1 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -352,10 +352,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml index 12311c661..0c91f1df8 100644 --- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml @@ -130,10 +130,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index a33ae8389..b3d1a0426 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -190,10 +190,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -289,10 +289,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index f3251b46e..44d539907 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -411,10 +411,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -538,10 +538,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1577,10 +1577,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1886,10 +1886,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index a1fc6232d..0629d63aa 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -285,10 +285,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy}, a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index ecd8aaf03..e375bb0b8 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -274,10 +274,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy}, a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index 964d04f0e..e325c0507 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -286,10 +286,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -311,10 +311,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml index 35d9d768a..c726213c2 100644 --- a/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml @@ -122,10 +122,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index 0aac472ea..155f3921a 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -170,10 +170,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 746a90447..a536c558c 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -172,10 +172,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index 4a51cea76..00246872e 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -129,10 +129,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml index fe717f577..83c835762 100644 --- a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml @@ -305,10 +305,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -322,7 +322,7 @@ - from HTTP_URL_CFG + from HTTP_URL_CFG AND ${page.where} @@ -330,10 +330,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},is_audit,CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY is_audit,CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index 450d31948..8e63f0b89 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -311,10 +311,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -765,10 +765,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -1153,10 +1153,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index 2abbdfb44..eb17f8a87 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -135,10 +135,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -163,7 +163,7 @@ AND r.is_audit = #{isAudit,jdbcType=INTEGER} - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 11eed19c0..9f923529f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -531,10 +531,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -556,10 +556,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1141,10 +1141,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index f2dea4e28..a672f431c 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -188,10 +188,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -213,7 +213,7 @@ AND r.is_valid != -1 - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -684,10 +684,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -709,7 +709,7 @@ AND a.is_valid != -1 - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml index a1c3384df..b33ce612b 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -243,10 +243,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml index c6cc56a42..1b64e30fb 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml @@ -127,10 +127,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 79a99009c..8e4ea49a9 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -213,10 +213,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index 2b003cc3e..a1519f23f 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -121,10 +121,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 36be61642..7f5f94cd3 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -86,10 +86,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc + ORDER BY ${page.orderBy},r.is_audit,r.create_time desc - ORDER BY r.is_valid desc, r.is_audit,r.create_time desc + ORDER BY r.is_audit,r.create_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 525d16061..0053f52a2 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -371,10 +371,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc + ORDER BY ${page.orderBy},r.is_audit,r.cfg_id desc - ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc + ORDER BY r.is_audit,r.cfg_id desc diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index f57d9e32a..d7e9b37ae 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -84,10 +84,10 @@ - ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc + ORDER BY ${page.orderBy},r.is_audit,r.create_time desc - ORDER BY r.is_valid desc, r.is_audit,r.create_time desc + ORDER BY r.is_audit,r.create_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 91bfd6403..ae5586621 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -333,10 +333,10 @@ - ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc