DI查询问题优化（耗材字典和添加DI产品信息）

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) {

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()) {
+        if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode()) || StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
+            if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
-            filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
+                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);
             }
 
-        }
+        } else
-//        filterUdiInfoRequest.setDiType(1);
+            filterUdiInfoRequest.setDiType(1);
-
         udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);

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>