Commit 93c93d42 authored by zp's avatar zp

Merge remote-tracking branch 'origin/v2.0.0' into dev

parents b2154c2e 4aaeaa77
...@@ -1920,7 +1920,7 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1920,7 +1920,7 @@ public class ProductServiceImpl implements ProductService, Constant {
} }
} }
sort = sort + " net_nav "; sort = (StringUtils.isEmpty(sort) ? "" : sort) + " net_nav ";
if (StringUtils.isNotEmpty(req.getNetSort())) { if (StringUtils.isNotEmpty(req.getNetSort())) {
sort = sort + req.getNetSort(); sort = sort + req.getNetSort();
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment