|
@@ -81,13 +81,11 @@ public class ApiBrandController extends ApiBaseAction {
|
|
@RequestParam(value = "limit",defaultValue = "10")Integer size,
|
|
@RequestParam(value = "limit",defaultValue = "10")Integer size,
|
|
@RequestParam(defaultValue = "-1")Integer type,String address,String name) {
|
|
@RequestParam(defaultValue = "-1")Integer type,String address,String name) {
|
|
|
|
|
|
- Long userId = getUserId();
|
|
|
|
- if (ObjectUtils.isEmpty(userId)) {
|
|
|
|
- return toResponsObject(401, "请先登录", "");
|
|
|
|
|
|
+ Long userId = null;
|
|
|
|
+ if (type == 31 || type == 32) {
|
|
|
|
+ userId = getUserId();
|
|
}
|
|
}
|
|
-
|
|
|
|
ApiPageUtils result = null;
|
|
ApiPageUtils result = null;
|
|
-
|
|
|
|
//查询列表数据
|
|
//查询列表数据
|
|
Map params = new HashMap();
|
|
Map params = new HashMap();
|
|
params.put("page", page);
|
|
params.put("page", page);
|
|
@@ -156,9 +154,7 @@ public class ApiBrandController extends ApiBaseAction {
|
|
if(params.containsKey("isShow")){
|
|
if(params.containsKey("isShow")){
|
|
requestScene.setIsShow(1);
|
|
requestScene.setIsShow(1);
|
|
}
|
|
}
|
|
- if(type == 21){
|
|
|
|
- requestScene.setUserId(-1L);
|
|
|
|
- }else if(params.containsKey("userId")){
|
|
|
|
|
|
+ if(params.containsKey("userId")){
|
|
requestScene.setPhone(getUserName());
|
|
requestScene.setPhone(getUserName());
|
|
}
|
|
}
|
|
|
|
|