From a6a1606eeacd036a4b0053958581f09e8be22877 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 6 Jan 2023 17:37:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=AD=89=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inventory/InvPreInProductsController.java     | 5 ++---
 .../src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml   | 1 +
 .../mybatis/mapper/inventory/InvPreInProductDao.xml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
index 6891f95..f82dcb7 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
@@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
-import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductEntity;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
@@ -50,14 +49,14 @@ public class InvPreInProductsController {
     @GetMapping("spms/prein/inv/products/filter")
     public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
         boolean showSup = false;
-        if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
+       /* if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
             filterInvProductRequest.setCustomerId(null);
             showSup = true;
         } else {
             CompanyEntity companyEntity = companyService.findCompany((filterInvProductRequest.getCustomerId()));
             filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
             filterInvProductRequest.setCustomerId(null);
-        }
+        }*/
         List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo;
         pageInfo = new PageInfo<>(invProductResponses);
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
index 6807df9..8e1049b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
@@ -54,6 +54,7 @@
         basic_products.basicPrductRemak6,
         basic_products.basicPrductRemak7,
         basic_products.basicPrductRemak8,
+        basic_udirel.id relId,
         basic_udirel.thirdId,
         basic_udirel.thirdName,
         basic_udirel.isUseDy,
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index ad5074b..a4154d4 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -202,7 +202,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.id
+        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"