From 5f1ec8c108ec249426b454350a5907e355781952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 7 Nov 2025 18:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B5=E4=BD=8D=E6=8E=A5=E5=8F=A3=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4-=E5=90=8E=E5=8F=B0-=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Nobility.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/adminapi/controller/Nobility.php b/application/adminapi/controller/Nobility.php
index c347ac4..1338d60 100644
--- a/application/adminapi/controller/Nobility.php
+++ b/application/adminapi/controller/Nobility.php
@@ -330,7 +330,9 @@ class Nobility extends adminApi
         if (!$decorate) {
             return V(0, "该装扮不存在");
         }
-        $nobility_dress_info = db::name('vs_nobility_decorate')->where(['lid'=>$lid, 'dpid'=>$dpid])->find();
+        $nobility_dress_info = db::name('vs_nobility_decorate')
+            ->where('delete_time', 0)
+            ->where(['lid'=>$lid, 'dpid'=>$dpid])->find();
         if ($nobility_dress_info) {
             return V(0, "该爵位已添加该装扮");
         }
@@ -354,11 +356,13 @@ class Nobility extends adminApi
         $order = input('order', 'id');
         $sort = input('sort', 'desc');
         $page = input('page', 1);
+        $lid = input('lid', '');
         $page_limit = input('page_limit', 30);
         $count = db::name('vs_nobility_decorate')->where('delete_time', 0)->count();
         $lists = db::name('vs_nobility_decorate')
             ->field('id,lid,did,type,dpid,day,createtime,updatetime')
             ->where('delete_time', 0)
+            ->where('lid', $lid)
             ->order($order, $sort)
             ->page($page, $page_limit)
             ->select();