|
@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.platform.annotation.CanUserUpdateRecord;
|
|
|
-import com.platform.entity.BrandEntity;
|
|
|
-import com.platform.entity.GoodsEntity;
|
|
|
-import com.platform.entity.Result;
|
|
|
-import com.platform.entity.SysUserBrand;
|
|
|
+import com.platform.entity.*;
|
|
|
import com.platform.service.BrandService;
|
|
|
import com.platform.service.GoodsService;
|
|
|
import com.platform.service.custom.MySysUserBrandService;
|
|
@@ -42,6 +39,10 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
+import static java.util.Comparator.comparing;
|
|
|
+import static java.util.stream.Collectors.collectingAndThen;
|
|
|
+import static java.util.stream.Collectors.toCollection;
|
|
|
+
|
|
|
/**
|
|
|
* Controller
|
|
|
*
|
|
@@ -351,10 +352,14 @@ public class BrandController extends AbstractController{
|
|
|
List<BrandEntity> list2 = brandService.getBrandByUserId(getUser().getId());
|
|
|
list.addAll(list2);
|
|
|
}
|
|
|
-
|
|
|
- return Result.success(list);
|
|
|
+ List<BrandEntity> listAll = list.stream().collect(
|
|
|
+ Collectors.collectingAndThen(
|
|
|
+ Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BrandEntity::getId))), ArrayList::new)
|
|
|
+ );
|
|
|
+ return Result.success(listAll);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 查看所有列表
|
|
|
*/
|