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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-12 17:37:29 +08:00
parent f33f32161e c7ff499956
commit 9e6b0d4ecd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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