|
@@ -1,19 +1,21 @@
|
|
|
package cn.efunbox.manage.base.service.impl;
|
|
|
|
|
|
-import cn.efunbox.manage.base.entity.Department;
|
|
|
import cn.efunbox.manage.base.entity.Product;
|
|
|
-import cn.efunbox.manage.base.entity.Project;
|
|
|
import cn.efunbox.manage.base.enums.BaseStatusEnum;
|
|
|
import cn.efunbox.manage.base.repository.DepartmentRepository;
|
|
|
import cn.efunbox.manage.base.repository.ProductRepository;
|
|
|
import cn.efunbox.manage.base.repository.ProjectRepository;
|
|
|
import cn.efunbox.manage.base.service.ProductService;
|
|
|
+import cn.efunbox.manage.common.enums.BaseOrderEnum;
|
|
|
+import cn.efunbox.manage.common.helper.SortHelper;
|
|
|
import cn.efunbox.manage.common.result.ApiCode;
|
|
|
import cn.efunbox.manage.common.result.ApiResult;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.LinkedHashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
|
* ProductServiceImpl
|
|
@@ -33,7 +35,9 @@ public class ProductServiceImpl implements ProductService {
|
|
|
|
|
|
@Override
|
|
|
public ApiResult list(Product product) {
|
|
|
- List<Product> products = productRepository.find(product);
|
|
|
+ List<Product> products = productRepository.find(product, SortHelper.sortMap2Sort(new LinkedHashMap<String,BaseOrderEnum>(){{
|
|
|
+ put("code",BaseOrderEnum.ASC);
|
|
|
+ }}));
|
|
|
if(Objects.nonNull(products)){
|
|
|
return ApiResult.ok(products);
|
|
|
}
|