diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml index f6c3539..0a07951 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml @@ -29,9 +29,12 @@ * 班组长条件筛选,一个班组长只可带领一个组,班组员条件筛选,一个组员只可在一个班组 */ - 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 + + + ORDER BY tp.create_time DESC - ORDER BY tp.create_time DESC, CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id