gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改配置列表查询缺省排序根据是否审核与有效标识字段，生效的配置排在前面；

Browse Source 
2.修改黑名单选项只有在block动作时显示，其他动作不显示该属性
This commit is contained in:
zhangwei
2018-12-23 15:44:45 +06:00
parent a0e944b2ed
commit 2564a258f2
40 changed files with 132 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
View File

@@ -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<Date>() {
//
// 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<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString,
new TypeToken<LogRecvData<NtcCollectVoipLog>>() {

40
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -682,10 +682,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -826,10 +826,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -956,10 +956,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1059,10 +1059,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1159,10 +1159,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1260,10 +1260,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1360,10 +1360,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1455,10 +1455,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1558,10 +1558,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1661,10 +1661,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
View File

@@ -352,10 +352,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy}，r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
View File

@@ -130,10 +130,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

8
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -190,10 +190,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -289,10 +289,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

16
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -411,10 +411,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -538,10 +538,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1577,10 +1577,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1886,10 +1886,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -285,10 +285,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -274,10 +274,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

10
src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
View File

@@ -286,10 +286,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -303,7 +303,7 @@
<include refid="ComplexkeywordCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} a
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -311,10 +311,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml
View File

@@ -122,10 +122,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
View File

@@ -170,10 +170,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -172,10 +172,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -129,10 +129,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DomainDao.xml
View File

@@ -305,10 +305,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

12
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -311,10 +311,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -765,10 +765,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1153,10 +1153,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

6
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -135,10 +135,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.cfg_id DESC
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -163,7 +163,7 @@
AND r.is_audit = #{isAudit,jdbcType=INTEGER}
</if>
</where>
ORDER BY r.cfg_id
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</select>
<!-- 保存地址池IP信息 -->

14
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -531,10 +531,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -548,7 +548,7 @@
<include refid="BaseIpCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} r
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -556,10 +556,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1141,10 +1141,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

12
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -188,10 +188,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.cfg_id DESC
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -213,7 +213,7 @@
AND r.is_valid != -1
</if>
</where>
ORDER BY r.cfg_id
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</select>
<insert id="savePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg">
@@ -684,10 +684,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.cfg_id DESC
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -709,7 +709,7 @@
AND a.is_valid != -1
</if>
</where>
ORDER BY a.cfg_id
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</select>
<select id="getSnatCfg" resultMap="policyMap">

4
src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml
View File

@@ -168,10 +168,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -243,10 +243,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml
View File

@@ -127,10 +127,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

8
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -213,10 +213,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -296,10 +296,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
View File

@@ -121,10 +121,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -86,10 +86,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc
</when>
<otherwise>
ORDER BY r.create_time desc
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
</otherwise>
</choose>

10
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -346,10 +346,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc
</otherwise>
</choose>
</select>
@@ -363,7 +363,7 @@
<include refid="BaseStringCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} r
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -371,10 +371,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -84,10 +84,10 @@
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc
</when>
<otherwise>
ORDER BY r.create_time desc
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -333,10 +333,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>