From 60fdd57da988725d9c6f69adcbdc2ed2bf0753ee Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 23 Dec 2025 09:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/SkuController.php | 9 ++++++++-
 app/common/service/PostService.php     | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/admin/controller/SkuController.php b/app/admin/controller/SkuController.php
index 22f61da..3f5bea8 100644
--- a/app/admin/controller/SkuController.php
+++ b/app/admin/controller/SkuController.php
@@ -64,7 +64,14 @@ class SkuController extends BaseController
          if (isset($data['spec_json'])){
              $data['spec'] = json_decode($data['spec_json'], true);
              foreach ($data['spec'] as $k=>$v){
-                 $data['spec'][$k]['attr_type'] = SkuAttribute::where('id', $v['attr_id'])->value('attr_type');
+                 $skuAttribute = SkuAttribute::where('category_id',$data['category_id'])
+                     ->where('attr_name', $v['attr_name'])->first();
+                 if ($skuAttribute){
+                     $data['spec'][$k]['attr_id'] = $skuAttribute['id'];
+                     $data['spec'][$k]['attr_type'] = $skuAttribute['attr_type'];
+                 }else{
+                     $data['spec'][$k]['attr_type'] = SkuAttribute::where('id', $v['attr_id'])->value('attr_type');
+                 }
              }
          }
          if (isset($data['category_id']))
diff --git a/app/common/service/PostService.php b/app/common/service/PostService.php
index efcaf97..bc69f4b 100644
--- a/app/common/service/PostService.php
+++ b/app/common/service/PostService.php
@@ -231,6 +231,7 @@ class PostService
         $lat = $request->get('lat');
         $status = $request->get('status', 1);
         $keyword = $request->get('keyword', '');
+        $category_id = $request->get('category_id');
 
         if (!$lng || !$lat) {
             throw new BusinessException('经纬度必传');
@@ -261,6 +262,10 @@ class PostService
             FROM post
             WHERE status = " . $status;
 
+        if (!empty($category_id)) {
+            $sql = $sql." AND category_id = " . $category_id;
+        }
+
         if (!empty($keyword)) {
             $sql = $sql." AND (content LIKE '%".$keyword."%' OR `model` LIKE '%".$keyword."%')";
         }