From c753cd5f64a11b3488eafd063bb4de81cd8d6896 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 10 Oct 2024 17:10:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/TbPeopleMapper.xml      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 @@
          * 班组长条件筛选，一个班组长只可带领一个组,班组员条件筛选，一个组员只可在一个班组
         */
         <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>
-        ORDER BY tp.create_time DESC, CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id
     </select>
 
     <select id="queryById" resultType="com.bonus.base.domain.TbPeople">