|
|
@@ -104,7 +104,7 @@
|
|
|
<if test="level == 4">
|
|
|
and fourthOrgId = #{departId}
|
|
|
</if>
|
|
|
- order by sortNumber ASC
|
|
|
+ order by startDate desc, sortNumber ASC
|
|
|
</select>
|
|
|
|
|
|
<select id="selectToBeConfirmedPrimaryList" resultType="SapUser">
|
|
|
@@ -131,13 +131,6 @@
|
|
|
<if test="name != null and name != ''">
|
|
|
and name like CONCAT(CONCAT('%', #{name}),'%')
|
|
|
</if>
|
|
|
- <!-- 排序 -->
|
|
|
- <if test="result == 'LEAVE'">
|
|
|
- order by endDate desc
|
|
|
- </if>
|
|
|
- <if test="result != 'LEAVE'">
|
|
|
- order by startDate desc
|
|
|
- </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectIngorePrimaryList" resultType="SapUser">
|
