修改配置缺省排序,未审核状态在前。
This commit is contained in:
@@ -682,10 +682,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -826,10 +826,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -956,10 +956,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1059,10 +1059,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1159,10 +1159,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1260,10 +1260,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1360,10 +1360,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1455,10 +1455,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1558,10 +1558,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1661,10 +1661,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -352,10 +352,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -130,10 +130,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -190,10 +190,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -289,10 +289,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -411,10 +411,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -538,10 +538,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1577,10 +1577,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1886,10 +1886,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -285,10 +285,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -274,10 +274,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -286,10 +286,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -311,10 +311,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -122,10 +122,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -170,10 +170,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -172,10 +172,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -129,10 +129,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -305,10 +305,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -330,10 +330,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
ORDER BY ${page.orderBy}
|
ORDER BY ${page.orderBy},is_audit,CFG_ID desc
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY CFG_ID desc
|
ORDER BY is_audit,CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -311,10 +311,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -765,10 +765,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1153,10 +1153,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -135,10 +135,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -163,7 +163,7 @@
|
|||||||
AND r.is_audit = #{isAudit,jdbcType=INTEGER}
|
AND r.is_audit = #{isAudit,jdbcType=INTEGER}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 保存地址池IP信息 -->
|
<!-- 保存地址池IP信息 -->
|
||||||
|
|||||||
@@ -531,10 +531,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -556,10 +556,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -1141,10 +1141,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -188,10 +188,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -213,7 +213,7 @@
|
|||||||
AND r.is_valid != -1
|
AND r.is_valid != -1
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="savePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg">
|
<insert id="savePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg">
|
||||||
@@ -684,10 +684,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
@@ -709,7 +709,7 @@
|
|||||||
AND a.is_valid != -1
|
AND a.is_valid != -1
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getSnatCfg" resultMap="policyMap">
|
<select id="getSnatCfg" resultMap="policyMap">
|
||||||
|
|||||||
@@ -168,10 +168,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -243,10 +243,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -127,10 +127,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -213,10 +213,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -121,10 +121,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
|
ORDER BY r.is_audit,r.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -86,10 +86,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
|
ORDER BY r.is_audit,r.create_time desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
|
|
||||||
|
|||||||
@@ -371,10 +371,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc
|
ORDER BY r.is_audit,r.cfg_id desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -84,10 +84,10 @@
|
|||||||
|
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
|
ORDER BY r.is_audit,r.create_time desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -333,10 +333,10 @@
|
|||||||
</trim>
|
</trim>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
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
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
|
ORDER BY a.is_audit,a.CFG_ID desc
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user