分类

app-hd/controllers/ItemClassController.php

@@ -125,21 +125,17 @@ class ItemClassController extends BaseController
         if (empty($class)) {
             util::fail('没有找到分类');
         }
-        if ($class->isDefault == 1) {
-            util::fail('不能修改默认分组');
-        }
-        $itemName = $class->name;
-        if ($itemName == $name) {
-            util::success('修改成功');
-        }
         if ($class->mainId != $this->mainId) {
-            util::fail('没有权限修改');
+            util::fail('不是您的分类');
         }
-        $has = ItemClassClass::getByCondition(['mainId' => $this->mainId, 'name' => $name]);
-        if (!empty($has)) {
+        $originName = $class->name ?? '';
+        $has = ItemClassClass::getByCondition(['mainId' => $this->mainId, 'name' => $name], true);
+        if (!empty($has) && $id != $has->id) {
             util::fail('名称已经存在');
         }
-        $class->name = $name;
+        if ($class->isDefault != 1) {
+            $class->name = $name;
+        }
         $class->inTurn = $inTurn;
         $class->print = $print;
         if (!empty($cover)) {