From 4c87d3ee8de55368910e34d00b996cdc4780bff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Mon, 9 Feb 2026 16:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=94=A8=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/basic/SelectMapper.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/system/src/main/resources/mapper/basic/SelectMapper.xml b/modules/system/src/main/resources/mapper/basic/SelectMapper.xml index 7deb11f..a047503 100644 --- a/modules/system/src/main/resources/mapper/basic/SelectMapper.xml +++ b/modules/system/src/main/resources/mapper/basic/SelectMapper.xml @@ -255,10 +255,7 @@ bst.team_name as name FROM bm_sub_contract bsc - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id - AND bsr.type = '3' - AND bsr.is_active = '1' - LEFT JOIN bm_sub_team bst ON bst.id = bsr.`v` + LEFT JOIN bm_sub_team bst ON bst.sub_id = bsc.sub_id AND bst.is_active = '1' WHERE bst.id is not null and bsc.is_active = '1' @@ -278,8 +275,7 @@ if(btur.is_foreman = 1, btur.id_number, 0) as isForeman FROM bm_sub_team bst - LEFT JOIN bm_sub_relation bsr ON bsr.v = bst.id and bsr.is_active = '1' and bsr.type = 3 - LEFT JOIN bm_sub_contract bsc ON bsr.sub_contract_id = bsc.id and bsc.is_active= '1' + LEFT JOIN bm_sub_contract bsc ON bst.sub_id = bsc.sub_id and bsc.is_active= '1' LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active= '1' left join bm_team_user_relation btur on btur.team_id = bst.id and btur.is_active = 1 WHERE bst.is_active = '1' @@ -422,8 +418,8 @@ bp.`name` FROM bm_sub_team bst - LEFT JOIN bm_sub_relation bsr ON bsr.v = bst.id and bsr.is_active = '1' and bsr.type = 3 - LEFT JOIN bm_sub_contract bsc ON bsr.sub_contract_id = bsc.id and bsc.is_active= '1' + + LEFT JOIN bm_sub_contract bsc ON bst.sub_id = bsc.sub_id and bsc.is_active= '1' LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active= '1' WHERE bst.is_active = '1'and bst.id = #{teamId}