From b2a8e51340fdf7ee26a76d1c150329ab7219a645 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 25 Oct 2022 22:42:45 +0800
Subject: [PATCH] =?UTF-8?q?DI=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=88=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0DI=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/UdiInfoController.java      |  8 ++++++--
 .../controller/basic/UdiRelevanceController.java | 16 +++++++++-------
 .../mybatis/mapper/basic/UdiRelevanceDao.xml     |  1 -
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
index ddb4ab0..a9900c5 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
@@ -73,7 +73,7 @@ public class UdiInfoController {
     @GetMapping("udiwms/udiinfo/filterUdi")
     public BaseResponse filterUdi(FilterUdiInfoRequest filterUdiInfoRequest) {
         String nameCode = null;
-        if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().equals("")) {
+        if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
             if (udiEntity != null) {
                 nameCode = udiEntity.getUdi();
@@ -84,7 +84,11 @@ public class UdiInfoController {
             nameCode = filterUdiInfoRequest.getNameCode();
         ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
         BeanUtils.copyProperties(filterUdiInfoRequest, productInfoFilterRequest);
-        productInfoFilterRequest.setNameCode(nameCode);
+        if (StrUtil.isNotEmpty(nameCode)) {
+            productInfoFilterRequest.setNameCode(nameCode);
+        }else {
+            productInfoFilterRequest.setDiType("1");
+        }
         try {
             BaseResponse<PageSimpleResponse<ProductInfoEntity>> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest);
             if (udiDlDeviceResponse.getCode() != 20000) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
index d588213..6dab35c 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
@@ -134,19 +134,21 @@ public class UdiRelevanceController {
         }
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
 
-        if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
-            filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
-
+        if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode()) || StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
+            if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
+                UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
+                filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
+            } else if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
+                filterUdiInfoRequest.setNameCode(filterUdiInfoRequest.getUnionCode());
+            }
             List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
             if (temps != null && temps.size() > 0) {
                 filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
                 filterUdiInfoRequest.setNameCode(null);
             }
 
-        }
-//        filterUdiInfoRequest.setDiType(1);
-
+        } else
+            filterUdiInfoRequest.setDiType(1);
         udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 6906f4a..7b889a7 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -306,7 +306,6 @@
             </if>
 
         </where>
-        Group by  basic_udirel.uuid
         ORDER BY modifyTime DESC
     </select>