wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

..

This commit is contained in:
dinggang 2022-08-12 17:35:04 +08:00
parent ce07b0ea32
commit c7ff499956
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -193,8 +193,11 @@
<if test="orderField == 'deptSort'"> <if test="orderField == 'deptSort'">
ORDER BY sd.type, sd.sort ORDER BY sd.type, sd.sort
</if> </if>
<if test="orderField != 'pin_top' and orderField != 'deptSort'">
ORDER BY ${orderField} ${orderType} ORDER BY ${orderField} ${orderType}
</if> </if>
</if>
</select> </select>
<select id="selectTypeCount" resultType="java.util.Map"> <select id="selectTypeCount" resultType="java.util.Map">
@ -458,7 +461,9 @@
<if test="orderField == 'deptSort'"> <if test="orderField == 'deptSort'">
ORDER BY sd.type, sd.sort ORDER BY sd.type, sd.sort
</if> </if>
<if test="orderField != 'pin_top' and orderField != 'deptSort'">
ORDER BY ${orderField} ${orderType} ORDER BY ${orderField} ${orderType}
</if>
LIMIT ${pageNum}, ${pageSize} LIMIT ${pageNum}, ${pageSize}
</if> </if>
</select> </select>
@ -600,10 +605,12 @@
</if> </if>
GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
LEFT JOIN sys_region sr ON sd.district = sr.id LEFT JOIN sys_region sr ON sd.district = sr.id
ORDER BY sd.type, sr.sort
) temp1 ) temp1
WHERE WHERE
1 = 1 1 = 1
AND temp1.deptCount != 0 AND temp1.deptCount != 0
</select> </select>
<select id="selectTypeCountByDept" resultType="java.lang.Integer"> <select id="selectTypeCountByDept" resultType="java.lang.Integer">