手持机部分

ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml

@@ -22,8 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
         <include refid="selectBasWarehouseVo"/>
-        where
-         1=1
+        <where>
             <if test="warehouseId != null  and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
             <if test="warehouseNo != null  and warehouseNo != ''">and warehouse_no = #{warehouseNo}</if>
             <if test="projectNo != null  and projectNo != ''">and project_no = #{projectNo}</if>
@@ -47,7 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-        ${params.warehouseDataScope}
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
     </select>
 
     <select id="selectBasWarehouseByWarehouseId" parameterType="String" resultMap="BasWarehouseResult">

ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml

@@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 where lot_no like concat('%',#{lotNo},'%')
                 )
             </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>