10/17 代码备份1.0

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -495,7 +495,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 break;
             case Constant.ORDER_ACTION_WAIT_DEAL: //待配货/拣货页面
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("enable", true).eq(bussinessTypeFilterRequest.getProductType() != null, "productType", bussinessTypeFilterRequest.getProductType()).and(
+                        .eq("enable", true)
+                        .eq(bussinessTypeFilterRequest.getProductType() != null, "productType", bussinessTypeFilterRequest.getProductType()).and(
                                 webNew -> webNew.in("checkWebNew", 1, 2)
                                         .or().in("checkPdaUn", 1, 2)
                                         .or().in("checkPdaEd", 1, 2)

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -60,9 +60,7 @@
             <if test="productType != null and productType != ''">
                 AND io.productType = #{productType}
             </if>
-            <!--            <if test="keyWords != null and keyWords != ''">-->
-            <!--                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))-->
-            <!--            </if>-->
+
 
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
@@ -199,7 +197,7 @@
             </if>
             <if test="keyWords != null and keyWords != ''">
                 and (io.billNo like concat('%', #{keyWords}, '%')
-                or io.fromCorp like concat('%', #{keyWords}, '%')
+                or bc1.name like concat('%', #{keyWords}, '%')
                 or io.workPlaceCode like concat('%', #{keyWords}, '%')
                 or io.busType like concat('%', #{keyWords}, '%')
                 or sw.workplaceName like concat('%', #{keyWords}, '%')