diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java
index 856473a..f408393 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java
@@ -17,7 +17,6 @@ public class ProjectGeneralBean {
     /**
      * 总工程电压
      */
-    @Excel(name = "电压等级")
     private String level;
     /**
      * 工程id
diff --git a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml
index f6674dd..5ccf24f 100644
--- a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml
@@ -268,16 +268,9 @@
 
 
     <select id="getEinPersonByProId" resultType="java.lang.String">
-        SELECT
-            bweh.exit_status
-        FROM
-            bm_project bp
-            LEFT JOIN bm_sub_contract bsc ON bp.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.type = '3'
-            LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` and btur.is_active = '1'
-            LEFT JOIN bm_worker_ein_history bweh ON bweh.id_number = btur.id_number AND bweh.is_active = '1'
-            WHERE bp.is_active = '1' AND bp.id = #{id}
-            GROUP BY btur.id_number
+        SELECT bweh.exit_status FROM bm_project bp
+        LEFT JOIN bm_worker_ein_history  bweh on bweh.project_id = bp.id AND bweh.is_active = '1'
+        WHERE bp.is_active = '1' AND bp.id = #{id}
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
index cd15470..1bfd7bd 100644
--- a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
@@ -13,10 +13,7 @@
 		AND sru.is_active = '1'
 		LEFT JOIN sys_role sr ON sr.id = sru.roleId
 		LEFT JOIN bm_subcontractor bs ON bs.id = t.sub_id
-		LEFT JOIN bm_team_user_relation btur ON btur.id_number = t.id_number and btur.is_active = '1'
-		LEFT JOIN bm_sub_relation bsr ON bsr.v = btur.team_id and bsr.is_active = '1' and bsr.type = '3'
-		LEFT JOIN bm_sub_contract bsc ON bsc.id = bsr.sub_contract_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_project   bp ON bp.id  = t.pro_id and bp.is_active = '1'
 		LEFT JOIN pm_organization po2 ON bp.company_id = po2.ID
 		LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number
 		LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id
@@ -55,7 +52,7 @@
 		t.phone AS phonenumber,
 		IF(
 		FIND_IN_SET( '3', sr.type ),
-		po2.`name`,
+		po.`NAME`,
 		po.`NAME`
 		) AS orgName,
 		sr.`NAME` AS roleName,
@@ -76,10 +73,7 @@
 		AND sru.is_active = '1'
 		LEFT JOIN sys_role sr ON sr.id = sru.roleId
 		LEFT JOIN bm_subcontractor bs ON bs.id = t.sub_id
-		LEFT JOIN bm_team_user_relation btur ON btur.id_number = t.id_number and btur.is_active = '1'
-		LEFT JOIN bm_sub_relation bsr ON bsr.v = btur.team_id and bsr.is_active = '1' and bsr.type = '3'
-		LEFT JOIN bm_sub_contract bsc ON bsc.id = bsr.sub_contract_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_project   bp ON bp.id  = t.pro_id and bp.is_active = '1'
 		LEFT JOIN pm_organization po2 ON bp.company_id = po2.ID
 		LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number
 		LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id
@@ -108,7 +102,7 @@
 				)
 			</if>
 		</where>
-		ORDER BY sr.id, t.id desc
+		ORDER BY t.id desc
         limit #{offset}, #{limit}
 	</select>
 
diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
index 3ac4a90..265281d 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
@@ -7,7 +7,7 @@
         bp.`NAME` as proName,
         bs.sub_name as subName,
         bsc.contract_name as contractName,
-        COUNT(bsr.id) AS teamNumber,
+        COUNT(bst.id) AS teamNumber,
         td.`value` AS evaMonth,
         fcpe.eva_grade AS evaGrade,
         fcpe.eva_name AS evaName,
@@ -24,7 +24,7 @@
         `bm_sub_contract` bsc
         LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
         LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
-        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.sub_id = bst.bs.id AND bst.is_active = '1'
         LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
         LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
 
@@ -53,7 +53,7 @@
           `bm_sub_contract` bsc
             LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
             LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
-            LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '1' and bsr.is_active = '3'
+            LEFT JOIN bm_sub_team  bst ON bst.sub_id = bst.bs.id AND bst.is_active = '1'
           LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
           LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
 
@@ -66,7 +66,7 @@
         bp.`NAME` as proName,
         bs.sub_name as subName,
         bsc.contract_name as contractName,
-        COUNT(bsr.id) AS teamNumber,
+        COUNT(bst.id) AS teamNumber,
         td.`value` AS evaMonth,
         fcpe.eva_grade AS evaGrade,
         fcpe.eva_name AS evaName,
@@ -77,7 +77,8 @@
         `bm_sub_contract` bsc
         LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
         LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
-        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.sub_id = bs.id and bst.is_active ='1'
+
         LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
         LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
 
diff --git a/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx b/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx
index 1e1d810..41b80eb 100644
Binary files a/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx and b/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx differ
diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js
index 8bc4351..dbc99e9 100644
--- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js
+++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js
@@ -141,9 +141,9 @@ function init() {
                         var proStatus = row['proStatus'];
                         var status = row['status'];
                         var html = '';
-                        // if(proStatus != "1"){
+                        if(proStatus != "1"){
                             html += toBeFinished(id, "sys:project:finish", pers);
-                        // }
+                        }
                         html += buttonView(id, "", pers);
                         html += buttonEdits(id, "sys:project:add", pers);
 
diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js
index 143ef1b..57e3d56 100644
--- a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js
+++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js
@@ -108,7 +108,7 @@ function init() {
                 {"data": "roleName", "defaultContent": "","width":"9%"},
                 {"data": "proName", "defaultContent": "","width":"9%"},
                 {"data": "createTime", "defaultContent": "","width":"9%"},
-                {"data": "isPush", "defaultContent": "","width":"6%",
+                /*{"data": "isPush", "defaultContent": "","width":"6%",
                     "render": function (data, type, row) {
                         var isPush = row['isPush'];
                         let html = ""
@@ -123,7 +123,7 @@ function init() {
                         }
                         return html;
                     }
-                },
+                },*/
                 {
                     "width":"10%",
                     "data": "",
@@ -134,9 +134,9 @@ function init() {
                         var phone = row['phone'];
                         var isPush = row['isPush'];
                         var push = ""
-                        if(isPush !== 1){
+                        /*if(isPush !== 1){
                             push = buttonPushData( id,"sys:user:push", pers);
-                        }
+                        }*/
                         var edit = buttonEditData( id, phone, "sys:user:add", pers);
                         var del = buttonDelData(id,"sys:user:del", pers);
                         var Reset = buttonResetData(id, "sys:user:reset", pers);
@@ -199,7 +199,7 @@ function buttonEditData(id,phone, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='修改' onclick='editView(\"" + id + "\",\"" + phone + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='修改' onclick='editView(\"" + id + "\",\"" + phone + "\")'>修改</button>");
     return btn.prop("outerHTML");
 }
 
@@ -274,7 +274,7 @@ function buttonResetData(id, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='重置密码' onclick='resetView(\"" + id +"\")'><i class='layui-icon'>&#xe673;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='重置密码' onclick='resetView(\"" + id +"\")'>重置密码</button>");
     return btn.prop("outerHTML");
 }
 
@@ -312,7 +312,7 @@ function resetView(id) {
                 return "";
             }
         }
-        var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='delView(\"" + id +"\")'><i class='layui-icon'>&#xe640;</i></button>");
+        var btn = $("<button class='layui-btn layui-btn-xs' style='background-color:red;' title='删除' onclick='delView(\"" + id +"\")'>删除</button>");
         return btn.prop("outerHTML");
     }
 
diff --git a/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html b/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html
index f558622..d183731 100644
--- a/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html
+++ b/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html
@@ -23,27 +23,27 @@
 	                   			<td>
 									<form class="layui-form" onsubmit="return false">
 										<div class="form-group">
-                                            <div class="layui-inline" style="margin-left: -1%;">
+                                            <!--<div class="layui-inline" style="margin-left: -1%;">
                                                 <div class="layui-input-inline" style="margin-left: 7%;">
                                                     <select id="orgId" name="orgId" lay-filter="orgId" lay-search>
                                                     </select>
                                                 </div>
-                                            </div>
+                                            </div>-->
 
                                             <div class="layui-inline">
-                                                <div class="layui-input-inline" style="margin-top: -1.5%;">
+                                                <div class="layui-input-inline" >
                                                     <input id="username" type="text" class="layui-input" placeholder="用户名" style="margin-top: 1%;">
                                                 </div>
                                             </div>
 
                                             <div class="layui-inline">
-                                                <div class="layui-input-inline" style="margin-top: -1.5%;">
+                                                <div class="layui-input-inline" >
                                                     <input id="phone" type="text" class="layui-input" placeholder="联系方式"style="margin-top: 1%;">
                                                 </div>
                                             </div>
 
                                             <div class="layui-inline">
-                                                <div class="layui-input-inline" style="margin-top: -1.5%;">
+                                                <div class="layui-input-inline" >
                                                     <input id="keyWord" type="text" class="layui-input" placeholder="请输入关键字"style="margin-top: 1%;">
                                                 </div>
                                             </div>
@@ -78,7 +78,7 @@
                                     <th>角色</th>
                                     <th>所属分包/工程<br/>(分包/班组用户必选)</th>
                                     <th>创建时间</th>
-                                    <th>推送状态</th>
+<!--                                    <th>推送状态</th>-->
                                     <th>操作</th>
                                 </tr>
                             </thead>