From 03d8f1b8af36936911dcc71e6eea2c5c78966de5 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 9 Jan 2025 16:49:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=204641=20?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/PersonSettingServiceImpl.java     | 44 +++++++++----------
 .../mapper/team/PersonSettingMapper.xml       | 24 ++++++++++
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
index 152b4db..25b293d 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
@@ -169,30 +169,30 @@ public class PersonSettingServiceImpl implements PersonSettingService {
 
     @Override
     public List<TeamPersonBean> databaseListList(Map<String, Object> params, Integer offset, Integer limit) {
-        //1.0先查有哪些人员已经在场但无分包班组
-        List<TeamPersonBean> personBeanList = dao.getEinWorkerByNoTeam(params);
-        //2.0哪些在场但无分包班组人员可以被选中
-        List<TeamPersonBean> personList = dao.getEinWorkerByNoTeam2(params);
-        for (int i = 0; i < personBeanList.size(); i++) {
-            for (TeamPersonBean teamPersonBean : personList) {
-                if (personBeanList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
-                    personBeanList.remove(i);
-                    i--;
-                    break;
-                }
-            }
-        }
+//        //1.0先查有哪些人员已经在场但无分包班组
+//        List<TeamPersonBean> personBeanList = dao.getEinWorkerByNoTeam(params);
+//        //2.0哪些在场但无分包班组人员可以被选中
+//        List<TeamPersonBean> personList = dao.getEinWorkerByNoTeam2(params);
+//        for (int i = 0; i < personBeanList.size(); i++) {
+//            for (TeamPersonBean teamPersonBean : personList) {
+//                if (personBeanList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
+//                    personBeanList.remove(i);
+//                    i--;
+//                    break;
+//                }
+//            }
+//        }
         //2.0查询此班组绑定工程
         List<TeamPersonBean> allList = dao.databaseListList(params, offset, limit);
-        for (int i = 0; i < allList.size(); i++) {
-            for (TeamPersonBean teamPersonBean : personBeanList) {
-                if (allList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
-                    allList.remove(i);
-                    i--;
-                    break;
-                }
-            }
-        }
+//        for (int i = 0; i < allList.size(); i++) {
+//            for (TeamPersonBean teamPersonBean : personBeanList) {
+//                if (allList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
+//                    allList.remove(i);
+//                    i--;
+//                    break;
+//                }
+//            }
+//        }
         return allList;
     }
 
diff --git a/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml b/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
index 8c3dd11..dd0de4d 100644
--- a/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
@@ -259,6 +259,30 @@
 			LEFT JOIN bm_certificate_type bct ON bct.id = cer.certificate_id
 		WHERE
 			btur.ID_NUMBER IS NULL
+		and not exists (
+			select
+				bweh.id_number
+			from
+				bm_worker_ein_history bweh
+			left join bm_team_user_relation btur on
+					btur.ID_NUMBER = bweh.id_number
+					and btur.is_active = '1'
+			left join bm_sub_contract bsc on
+					bweh.project_id = bsc.pro_id
+					and bsc.is_active = '1'
+			left join bm_sub_relation bsr on
+					bsc.id = bsr.sub_contract_id
+					and bsr.is_active = '1'
+					and bsr.v is not null
+			where
+					bweh.is_active = '1'
+					and bweh.sub_id = '0'
+					and bweh.team_id = '0'
+					and bw.id_number = bweh.id_number
+					and btur.ID_NUMBER is null
+					and bsr.v != #{params.teamId}
+					group by
+					bweh.id_number)
 			AND bw.IS_ACTIVE = '1'
 			AND bw.is_furlough_person != '1'
 			<if test=" params.keyWord != null and params.keyWord != '' ">