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

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>