diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java
index 497e157..5b8966d 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java
@@ -27,5 +27,9 @@ public class AreaDto {
 
     private String gtId;
 
+    private String areaName;
+
+    private String proName;
+
 
 }
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml
index 5d0942a..34a16fe 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml
@@ -51,7 +51,7 @@
                     t_code =#{keyWord}
                     )
             </if>
-        <if test="keyWord!=null and keyWord!=''">
+        <if test="onLine!=null and onLine!=''">
               and  on_line =#{onLine}
         </if>
     </select>
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml
index 6e6c1d7..3b8a7be 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml
@@ -43,8 +43,8 @@
             <if test='types=="2"'>
                 and   tcm.user_id is null
             </if>
-            <if test='types=="1"'>
-                and  tcm.user_id is not null     and   tcm.user_id!=#{userId}
+            <if test='type=="1"'>
+                   and   (tcm.user_id!=#{userId}  or tcm.user_id is null   )
             </if>
             <if test="keyWord!=null and keyWord!=''">
                 AND   (
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml
index f6364d7..5dd6665 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml
@@ -64,8 +64,11 @@
             left join tb_project pro  on pro.bid_code=area.bid_code and pro.del_flag=0
             LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id and  gt.del_flag=0
             where area.del_flag=0
-                <if test="keyWord!=null and keyWord!=''">
-                  AND    INSTR(area_name,#{keyWord}) > 0
+                <if test="areaName!=null and areaName!=''">
+                  AND    INSTR(area_name,#{areaName}) > 0
+                </if>
+                <if test="proName!=null and proName!=''">
+                    AND    INSTR(pro.pro_name,#{proName}) > 0
                 </if>
     </select>
     <select id="getProjectTypeByBidCode" resultType="java.lang.String">
@@ -128,8 +131,8 @@
     <select id="getProCostList" resultType="com.securitycontrol.entity.screen.vo.ProCostVo">
         SELECT pro.pro_name proName,tpc.cost ,tpc.remark,tpc.create_time createTime,tpc.id
             FROM tb_project_cost tpc
-            left join tb_project pro on pro.bid_code=tpc.bid_code
-            where  pro.bid_code=#{bidCode}
+            left join tb_project pro on pro.bid_code=tpc.bid_code and pro.del_flag=0
+              where  pro.bid_code=#{bidCode}
     </select>
 
 
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml
index e0e3891..f307eaa 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml
@@ -63,8 +63,8 @@
                     FROM tb_project pro
                     left join sys_build sb on pro.org=sb.org_id
                     left join tb_user_pro tup  on tup.bid_cod=pro.bid_code   and tup.del_flag=0
-                WHERE    pro.del_flag=0  and (tup.user_id!=4 or   tup.user_id is null)
-                <if test='type=="1"'>
+                WHERE    pro.del_flag=0  and (tup.user_id!=#{userId} or   tup.user_id is null)
+                         <if test='type=="1"'>
                             AND   tup.user_id is null
                         </if>
                         <if test='type=="2"'>