bug优化
This commit is contained in:
parent
08be20dea4
commit
c753cd5f64
|
|
@ -29,9 +29,12 @@
|
||||||
* 班组长条件筛选,一个班组长只可带领一个组,班组员条件筛选,一个组员只可在一个班组
|
* 班组长条件筛选,一个班组长只可带领一个组,班组员条件筛选,一个组员只可在一个班组
|
||||||
*/
|
*/
|
||||||
<if test="isAll != null and isAll == 0">
|
<if test="isAll != null and isAll == 0">
|
||||||
and (tp.team_id is null and tp.id not in (select rel_id from tb_team where del_flag = '0' and rel_id is not null and js_time is null))
|
and tp.team_id is null
|
||||||
|
ORDER BY CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id
|
||||||
|
</if>
|
||||||
|
<if test="isAll == null or isAll != 0">
|
||||||
|
ORDER BY tp.create_time DESC
|
||||||
</if>
|
</if>
|
||||||
ORDER BY tp.create_time DESC, CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryById" resultType="com.bonus.base.domain.TbPeople">
|
<select id="queryById" resultType="com.bonus.base.domain.TbPeople">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue