修改小程序场景查询逻辑

platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -88,27 +88,25 @@ public class ApiBrandController extends ApiBaseAction {
     public Object list(@RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(value = "limit",defaultValue = "10")Integer size,
                        @RequestParam(defaultValue = "-1")Integer type,String address,String name) {
-        Long userId = null;
-        if (type == 31 || type == 32) {
-            userId = getUserId();
-            if (ObjectUtils.isEmpty(userId)) {
-                return toResponsObject(401, "请先登录", "");
-            }
-            // 获取用户手机号
-            UserVo userVo = apiUserService.queryObject(userId);
-            String phone = userVo.getMobile();
-            if(ObjectUtils.isEmpty(phone)){
-                logger.error("用户未绑定手机号：{}",userId);
-                return toResponsSuccess(new ApiPageUtils(new PageInfo(new ArrayList<BrandVo>())));
-            }
-            // 根据手机号获取系统用户ID
-            SysUserEntity userEntity = sysUserService.queryByUserMobile(phone);
-            if(ObjectUtils.isEmpty(userEntity)){
-                logger.error("获取系统用户失败：{}",phone);
-                return toResponsSuccess(new ApiPageUtils(new PageInfo(new ArrayList<BrandVo>())));
-            }
-            userId = userEntity.getUserId();
+
+        Long userId = getUserId();
+        if (ObjectUtils.isEmpty(userId)) {
+            return toResponsObject(401, "请先登录", "");
+        }
+        // 获取用户手机号
+        UserVo userVo = apiUserService.queryObject(userId);
+        String phone = userVo.getMobile();
+        if (ObjectUtils.isEmpty(phone)) {
+            logger.error("用户未绑定手机号：{}", userId);
+            return toResponsSuccess(new ApiPageUtils(new PageInfo(new ArrayList<BrandVo>())));
         }
+        // 根据手机号获取系统用户ID
+        SysUserEntity userEntity = sysUserService.queryByUserMobile(phone);
+        if (ObjectUtils.isEmpty(userEntity)) {
+            logger.error("获取系统用户失败：{}", phone);
+            return toResponsSuccess(new ApiPageUtils(new PageInfo(new ArrayList<BrandVo>())));
+        }
+        userId = userEntity.getUserId();
 
         ApiPageUtils result = null;
 
@@ -182,9 +180,12 @@ public class ApiBrandController extends ApiBaseAction {
             if(params.containsKey("isShow")){
                 requestScene.setIsShow(true);
             }
-            if(params.containsKey("userId"))
-                requestScene.setUserId(userId);{
+            if(type == 21){
+                requestScene.setUserId(-1L);
+            }else if(params.containsKey("userId")){
+                requestScene.setPhone(phone);
             }
+
             if(params.containsKey("name"))
                 requestScene.setSceneName(name);{
             }