From 71ce9595e3631d874fd5f952b7cb5393ff818b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sun, 7 Dec 2025 16:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E6=89=AE-=E9=99=8D=E8=BA=AB=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Guild.php | 2 +-
 application/api/model/Decorate.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index 29b17ae..241442f 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -274,7 +274,7 @@ class Guild extends adminApi
                 return V(0, "该工会不存在");
             }
             if  (!empty($request['guild_name'])) {
-                $guild_name = model('Guild')->getOne(['guild_name'=>$request['guild_name']]);
+                $guild_name = model('Guild')->getOne(['guild_name'=>$request['guild_name'],'delete_time'=>0]);
                 if (!empty($guild_name) && $guild_name['id'] != $request['id']) {
                     return V(0, "该工会名称已存在");
                 }
diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index a8da58c..8444977 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -230,6 +230,7 @@ class Decorate extends Model
                 }
                 $data['createtime'] = $now_time;
                 $data['special_num'] = $decorate_info['special_num'] ?? '';
+                $data['num'] = 1;
                 $result = db::name('vs_user_decorate')->insert($data);
             }else{
                 if($decorate_info['type'] == 12){