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

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

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信息 -->