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

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -169,6 +169,8 @@ public class UdiRelevanceController extends BaseController {
                     filterUdiRelRequest.setNameCode(null);
                 }
             }
+        } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getNameCode()) || StrUtil.isNotEmpty(filterUdiRelRequest.getKeyWords())) {
+            filterUdiRelRequest.setDiType(null);
         }  else {
             filterUdiRelRequest.setDiType(1);
         }