工业居民安检修改

huaxin-system/src/main/resources/mapper/system/TBusinessMapper.xml

@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="soutext!=null and soutext!=''">
                 and (t.usernum like concat('%', #{soutext}, '%') or t.company like concat('%', #{soutext}, '%'))
             </if>
+            <if test="taskType != null and taskType != ''">and t.task_type = #{taskType}</if>
         </where>
         <if test="selectFrom==1">
             order by  tp.status

huaxin-system/src/main/resources/mapper/system/TTaskMapper.xml

@@ -196,7 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             task.status = 0
             <if test="type != null">AND task.type = #{ type }</if>
-            <if test="checkType != null">AND task.check_type = #{ checkType }</if>
+            <if test="type != null and type == 3 and checkType != null">AND task.check_type = #{ checkType }</if>
+            <if test="type != null and type == 2 and checkType != null">AND task.business_type = #{ checkType }</if>
             <if test="taskType != null and taskType != ''">AND task.task_type = #{ taskType }</if>
         </where>
         ORDER BY create_time DESC