申购产品生产企业对不上问题

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -52,6 +52,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private String corpId;
     private String billType;
+    private String manufactory;
     private String flbm;
     private List<String> uuids;
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -192,8 +192,12 @@
 
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+                AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
+
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
@@ -208,16 +212,16 @@
             </if>
             <if test="thrPiId != '' and thrPiId != null">
                 and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
-                or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
-                or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
-                or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
-                or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+                        or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                        or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                        or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                        or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%', #{ggxh}, '%')
+                AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+                AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode LIKE concat(#{nameCode}, '%')
@@ -244,7 +248,7 @@
                 AND basic_udirel.lockStatus = #{lockStatus}
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+                AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
@@ -273,7 +277,7 @@
                 </foreach>
             </if>
             <if test="flbm != '' and flbm != null">
-                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm}  or tp.cplb = #{flbm})
+                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm})
             </if>
             <if test="companyName != '' and companyName != null">
                 AND basic_corp.name like concat('%', #{companyName}, '%')