Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

@@ -57,7 +57,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
     public Result<ProductEntity> find(ProductEntity entity, PageInfo pageInfo, Context context) throws AppException {
         Result<ProductEntity> productEntityResult = new Result<>();
         if (ObjectUtils.isEmpty(entity.getCategoryId()) && ObjectUtils.isEmpty(entity.getCompanyId())) {
-            return super.find(entity, pageInfo, context);
+            return this.find(entity, pageInfo, context);
         } else {
             //针对不同查询返回不同结果集
             if (!ObjectUtils.isEmpty(entity.getCategoryId()) && ObjectUtils.isEmpty(entity.getCompanyId())) {