as

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -321,14 +321,12 @@
                         RW.WAREHOUSE_NAME "warehouseName"
                  from RMS_WAREHOUSE RW
                  where RW.DELETED = 0
-                 <where>
                      <if test="type != null">
-                         RW.WAREHOUSE_TYPE_ID = #{type}
+                      and   RW.WAREHOUSE_TYPE_ID = #{type}
                      </if>
                      <if test="index != null">
-                         instr(RW.WAREHOUSE_NAME, #{index}) > 0
+                      and   instr(RW.WAREHOUSE_NAME, #{index}) > 0
                      </if>
-                 </where>
              )
         <where>
             <if test="warehouseName != null">