diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java
index d3bbe80..1435cfb 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java
@@ -16,6 +16,7 @@ import com.bonus.common.security.annotation.InnerAuth;
 import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission;
+
 /**
  * 分包班组出入场
  * @author 马三炮
@@ -47,6 +50,12 @@ public class PmSubTeamContractController  extends BaseController {
     @SysLog(title = "分包班组入场信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组入场信息管理->分包班组入场信息列表")
     public TableDataInfo list(PmSubTeamContract pmSubTeamContract) {
         try {
+
+            Map<String,String> map = dealWithPermission();
+            if(!map.isEmpty()){
+                // 3. 将 map 中的值复制到 o 对象中
+                BeanUtils.populate(pmSubTeamContract, map);
+            }
             startPage();
             List<PmSubTeamContract> list = pmSubTeamContractService.selectSubTeamContractList(pmSubTeamContract);
             return getDataTable(list);
@@ -115,7 +124,7 @@ public class PmSubTeamContractController  extends BaseController {
             logger.error(e.toString(), e);
         }
     }
- 
+
     /**
      * 获取班组人员出入场信息
      */
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java
index b2ae2a7..bb2724d 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java
@@ -102,4 +102,19 @@ public class PmSubTeamContract {
      * 文件列表
      */
     List<UploadFileVo> contractFile;
+
+    /**
+     * 总公司
+     */
+    private Integer comId;
+
+    /**
+     * 分公司
+     */
+    private Integer subComId;
+
+    /**
+     * 项目部id
+     */
+    private Integer orgId;
 }
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml
index 1b55a62..247069f 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml
@@ -27,27 +27,38 @@
     </update>
 
     <select id="selectSubTeamContractList" resultType="com.bonus.bmw.domain.po.PmSubTeamContract">
-        select id,team_id,team_name,sub_id,sub_name,pro_id,pro_name,team_ein_time,team_ein_status,team_exit_time
-        from pm_sub_team_contract where is_active = '1'
+        select pstc.id,pstc.team_id,pstc.team_name,pstc.sub_id,pstc.sub_name,pstc.pro_id,pstc.pro_name,
+               pstc.team_ein_time,pstc.team_ein_status,pstc.team_exit_time
+        from pm_sub_team_contract pstc
+        left join pm_project pp on pstc.pro_id = pp.id
+        where is_active = '1'
         <if test="teamName!=null and teamName!= ''">
-            and team_name  LIKE CONCAT('%', #{teamName}, '%')
+            and pstc.team_name  LIKE CONCAT('%', #{teamName}, '%')
         </if>
         <if test="subName!=null and subName!= ''">
-            and sub_name  LIKE CONCAT('%', #{subName}, '%')
+            and pstc.sub_name  LIKE CONCAT('%', #{subName}, '%')
         </if>
         <if test="proName!=null and proName!= ''">
-            and pro_name  LIKE CONCAT('%', #{proName}, '%')
+            and pstc.pro_name  LIKE CONCAT('%', #{proName}, '%')
         </if>
         <if test="teamEinStatus!=null and teamEinStatus!= ''">
-            and team_ein_status  LIKE CONCAT('%', #{teamEinStatus}, '%')
+            and pstc.team_ein_status  LIKE CONCAT('%', #{teamEinStatus}, '%')
         </if>
         <if test="teamId!=null ">
-            and team_id =#{teamId}
+            and pstc.team_id =#{teamId}
         </if>
         <if test="proId!=null ">
-            and pro_id =#{proId}
+            and pstc.pro_id =#{proId}
+        </if>
+        <if test="comId!=null">
+            and pp.com_id =#{comId}
+        </if>
+        <if test="subComId!=null">
+            and pp.sub_com_id =#{subComId}
+        </if>
+        <if test="orgId!=null">
+            and pp.org_id =#{orgId}
         </if>
-
     </select>
     <select id="getSubTeamContractById" resultType="com.bonus.bmw.domain.po.PmSubTeamContract">
         select id,team_id,team_name,sub_id,sub_name,pro_id,pro_name,team_ein_time,team_ein_status,team_exit_time