Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

6 months ago · 7e2460352b
parent d6a9524e11 eb24096db7
commit 7e2460352b
1 changed files with 3 additions and 1 deletions
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@ -169,7 +169,9 @@ public class UdiRelevanceController extends BaseController {
                    filterUdiRelRequest.setNameCode(null);
                }
            }
-        } else {
+        } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getNameCode()) || StrUtil.isNotEmpty(filterUdiRelRequest.getKeyWords())) {
+            filterUdiRelRequest.setDiType(null);
+        }  else {
            filterUdiRelRequest.setDiType(1);
        }
        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);