This commit is contained in:
parent
ce07b0ea32
commit
c7ff499956
|
@ -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">
|
||||
|
|
Loading…
Reference in New Issue