diff --git a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java index 5946ac71a..9a8d6a7d1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java @@ -142,7 +142,7 @@ public class CollectVoipLogController extends BaseController { url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG; String jsonString = HttpClientUtil.getMsg(url, params, request); -// GsonBuilder builder = new GsonBuilder(); + GsonBuilder builder = new GsonBuilder(); // builder.registerTypeAdapter(Date.class, new JsonDeserializer() { // // public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT, @@ -150,8 +150,8 @@ public class CollectVoipLogController extends BaseController { // return new Date(json.getAsJsonPrimitive().getAsLong()); // } // }); -// Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create(); - Gson gson = new GsonBuilder().create(); + Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create(); +// Gson gson = new GsonBuilder().create(); // gson泛型支持 LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>() { 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 89895b804..34f07a68a 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -826,10 +826,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -956,10 +956,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1059,10 +1059,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1159,10 +1159,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1260,10 +1260,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1360,10 +1360,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1455,10 +1455,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1558,10 +1558,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1661,10 +1661,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, 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 e601d22d6..4db144faf 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} + ORDER BY ${page.orderBy}，r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, 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 d551d6440..12311c661 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 d85f7485a..a33ae8389 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc @@ -289,10 +289,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_valid desc, 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 e90559178..f3251b46e 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -538,10 +538,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1577,10 +1577,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1886,10 +1886,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 8e915f9af..a1fc6232d 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 411a2ca6d..ecd8aaf03 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 6f8ff863a..964d04f0e 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -303,7 +303,7 @@ - from ${tableName} + from ${tableName} a AND ${page.where} @@ -311,10 +311,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_valid desc, 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 b65d4774b..35d9d768a 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 0d5bd808f..0aac472ea 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 9b7429421..746a90447 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 8627c300e..4a51cea76 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 8c2fff8ea..fe717f577 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.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 ade978ed2..450d31948 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc @@ -765,10 +765,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc @@ -1153,10 +1153,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 cb00eec6e..2abbdfb44 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.cfg_id DESC + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -163,7 +163,7 @@ AND r.is_audit = #{isAudit,jdbcType=INTEGER} - ORDER BY r.cfg_id + ORDER BY r.is_valid desc, 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 b8ea447a3..11eed19c0 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -548,7 +548,7 @@ - from ${tableName} + from ${tableName} r AND ${page.where} @@ -556,10 +556,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -1141,10 +1141,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 83cf57b38..f2dea4e28 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.cfg_id DESC + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -213,7 +213,7 @@ AND r.is_valid != -1 - ORDER BY r.cfg_id + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -684,10 +684,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.cfg_id DESC + ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc @@ -709,7 +709,7 @@ AND a.is_valid != -1 - ORDER BY a.cfg_id + ORDER BY a.is_valid desc, 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 aa6bae109..a1c3384df 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 51f832b34..c6cc56a42 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, 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 2971e2990..79a99009c 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc @@ -296,10 +296,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 1d5556e77..2b003cc3e 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, 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 b18d65812..36be61642 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc - ORDER BY r.create_time desc + ORDER BY r.is_valid desc, 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 df968ffad..525d16061 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -346,10 +346,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc @@ -363,7 +363,7 @@ - from ${tableName} + from ${tableName} r AND ${page.where} @@ -371,10 +371,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, 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 93032cba3..f57d9e32a 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} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc - ORDER BY r.create_time desc + ORDER BY r.is_valid desc, 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 271e34d4e..91bfd6403 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} + ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 12f1897ab..102091528 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -237,12 +237,12 @@ -
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index a31873033..031fb57de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -237,12 +237,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index a928651ac..f2724bdee 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -239,12 +239,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index a24a8400c..c93109aa0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -212,12 +212,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 9599766bc..3deeeb8bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -535,12 +535,12 @@ var showHideIPSECProtocol=function(obj){
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index d01e9b341..66dbe66f0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -243,12 +243,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp index bfa3828dc..2b491218c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -207,12 +207,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 42efd130b..9f2538bb9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -219,12 +219,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 355e0dc19..fb27b1522 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -281,12 +281,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index ea8fb3de1..dfd5a6712 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -225,12 +225,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index 0e3f105de..ecb6dc728 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -210,12 +210,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp index 1bcbaac80..129f0635f 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp @@ -91,6 +91,7 @@ $(obj).find(".itemCode").attr("name","dictItemList["+index+"].itemCode"); $(obj).find(".itemValue").attr("name","dictItemList["+index+"].itemValue"); $(obj).find(".itemDesc").attr("name","dictItemList["+index+"].itemDesc"); + $(obj).find(".itemSort").attr("name","dictItemList["+index+"].itemSort"); $(obj).find(".itemStatus").attr("name","dictItemList["+index+"].status"); $(obj).find(".itemType").attr("name","dictItemList["+index+"].type"); @@ -180,6 +181,7 @@ + readonly="readonly"/> readonly="readonly"/> readonly="readonly"/> + readonly="readonly"/>