PDA任务大厅查询修改

mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

@@ -66,6 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="organizationId != null ">
             and organization_id = #{organizationId}
         </if>
+        <if test="organizationIdList != null and organizationIdList.size() > 0">
+            and organization_id in
+            <foreach collection="organizationIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="organizationName != null  and organizationName != ''">
             and organization_name like concat('%', #{organizationName}, '%')
         </if>
@@ -81,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="warehouseName != null  and warehouseName != ''">
             and warehouse_name like concat('%', #{warehouseName}, '%')
         </if>
+        <!-- taskType: 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点 7-交接 -->
         <if test="taskType != null and taskType != 0 ">
             and task_type = #{taskType}
         </if>
@@ -103,8 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and operators_by = #{operatorsBy}
             </if>
             <if test="tabType != null and tabType==2">
-                and (operators_by = ''
-                OR operators_by IS NULL)
+                and operators_by IS NULL
             </if>
 
         <if test="operatorsName != null  and operatorsName != ''">
@@ -122,8 +128,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </sql>
     <sql id="selectDeliveTaskPo2">
-
-
+            <if test="organizationId != null ">
+                and organization_id = #{organizationId}
+            </if>
+            <if test="organizationIdList != null and organizationIdList.size() > 0">
+                and organization_id in
+                <foreach collection="organizationIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="taskNumber != null  and taskNumber != ''">
                 and task_number = #{taskNumber}
             </if>