Merge remote-tracking branch 'origin/master'

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

@@ -66,4 +66,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String certIdFk;
     private String manufactory;
     private String tyshxydm;
+    private Boolean dispatch;
+    private Boolean groupBuy;
 }

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

@@ -39,6 +39,9 @@
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
+            <if test="name != '' and name != null">
+                AND name = #{name}
+            </if>
         </where>
         order by updateTime desc
 

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

@@ -410,6 +410,12 @@
             <if test="manufactory != null and manufactory != ''">
                 and manufactory LIKE concat('%',#{manufactory},'%')
             </if>
+            <if test="dispatch != null">
+                and basic_udirel.dispatch = #{dispatch}
+            </if>
+            <if test="groupBuy != null">
+                and basic_udirel.groupBuy = #{groupBuy}
+            </if>
         </where>
         ORDER BY modifyTime DESC
     </select>