政策状态修改 !!! 查询bug修复

This commit is contained in:
yuezhihang
2021-07-29 15:21:53 +08:00
parent 60dbb8faeb
commit 534caf3bdb
@@ -26,7 +26,14 @@
<!--分页显示A--> <!--分页显示A-->
<sql id="Base_Column_ListPageA"> <sql id="Base_Column_ListPageA">
TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id, TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,tree_pid TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,
tree_pid
</sql>
<!--分页显示A-->
<sql id="Base_Column_ListPageNewA">
TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,(@rownum :=@rownum + 1) AS rownum,TS_DICTYPE.show_index,tree_pid
</sql> </sql>
<!--分页显示B--> <!--分页显示B-->
@@ -34,6 +41,11 @@
a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index
</sql> </sql>
<!--分页显示B-->
<sql id="Base_Column_ListPageNewB">
a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.rownum,a.describes,a.show_index
</sql>
<sql id="Dic_Type_List"> <sql id="Dic_Type_List">
u.*, ur.id as type_id, u.*, ur.id as type_id,
ur.dic_type_code as dic_type_code, ur.dic_type_code as dic_type_code,
@@ -294,19 +306,20 @@
<!-- 查询TS_DICTYPE列表 --> <!-- 查询TS_DICTYPE列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select select
<include refid="Base_Column_ListPageB"/> <include refid="Base_Column_ListPageNewB"/>
from from
(select tmp_tb.* , rownum rn from (select tmp_tb.* from
(select (select
<include refid="Base_Column_ListPageA"/> <include refid="Base_Column_ListPageNewA"/>
from TS_DICTYPE from TS_DICTYPE
LEFT JOIN TS_DICTIONARY td ON td.id = TS_DICTYPE.dic_id LEFT JOIN TS_DICTIONARY td ON td.id = TS_DICTYPE.dic_id
,(SELECT @rownum := 0) b
<include refid="Base_Where_ClausePage"/> <include refid="Base_Where_ClausePage"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''"> <if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
) tmp_tb where rownum &lt;= ${pager.endIndex}) a ) tmp_tb where tmp_tb.rownum &lt;= ${pager.endIndex}) a
where rn &gt;= ${pager.startIndex} where a.rownum &gt;= ${pager.startIndex}
ORDER BY a.show_index ORDER BY a.show_index
</select> </select>
<!-- TS_DICTYPE 列表总数 --> <!-- TS_DICTYPE 列表总数 -->