Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -726,8 +726,12 @@ class PublicRpcService implements PublicRpcServiceInterface
             return Result::error("默认风格不能修改", 0);
         }
         $template = TemplateClass::where('id','!=',$data['id'])
-            ->where(['name' => $data['name']])
-            ->orWhere(['class_id' => $data['class_id']])
+            // ->where(['name' => $data['name']])
+            // ->orWhere(['class_id' => $data['class_id']])
+            ->where(function ($query) use ($data) {
+                $query->where('name', $data['name'])
+                    ->orWhere('class_id', $data['class_id']);
+            })
             ->first();
         if ($template) {
             return Result::error("风格名称或者风格编号已存在，不可编辑！", 0);
@@ -867,9 +871,11 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (empty($template)) {
             return Result::error("此皮肤不存在！", 0);
         }
-        $template = Template::where('id','!=',$data['id'])
-            ->where(['template_name' => $data['template_name']])
-            ->orWhere(['template_id' => $data['template_id']])
+        $template = Template::where('id', '!=', $data['id'])
+            ->where(function ($query) use ($data) {
+                $query->where('template_name', $data['template_name'])
+                    ->orWhere('template_id', $data['template_id']);
+            })
             ->first();
         if ($template) {
             return Result::error("皮肤名称或者皮肤编号已存在，不可编辑！", 0);