fix dept level bug (#306)

* fix dept level bug fix dept level bug 修改参数名防止歧义 * composer cs
mineadmin · Jul 11, 2024 · 3f11af4 · 3f11af4
1 parent d431f1a
commit 3f11af4
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 3 deletions.
diff --git a/app/System/Mapper/SystemDeptMapper.php b/app/System/Mapper/SystemDeptMapper.php
@@ -125,6 +125,18 @@ public function delLeader(int $id, array $users): bool
         return true;
     }
 
+    #[Transaction]
+    public function batchUpdate(array $update): bool
+    {
+        foreach ($update as $item) {
+            $result = parent::update($item['id'], $item['data']);
+            if (! $result) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 查询部门名称.
      */
@@ -138,6 +150,12 @@ public function checkChildrenExists(int $id): bool
         return $this->model::withTrashed()->where('parent_id', $id)->exists();
     }
 
+    public function getDescendantsDepts(int $id): array
+    {
+        $params = ['level' => $id];
+        return $this->handleSearch($this->model::query(), $params)->get()->toArray();
+    }
+
     /**
      * 搜索处理器.
      */
@@ -147,6 +165,10 @@ public function handleSearch(Builder $query, array $params): Builder
             $query->where('status', $params['status']);
         }
 
+        if (isset($params['level']) && filled($params['level'])) {
+            $query->where('level', 'like', '%' . $params['level'] . '%');
+        }
+
         if (isset($params['name']) && filled($params['name'])) {
             $query->where('name', 'like', '%' . $params['name'] . '%');
         }

diff --git a/app/System/Mapper/SystemMenuMapper.php b/app/System/Mapper/SystemMenuMapper.php
@@ -207,9 +207,9 @@ public function checkChildrenExists(int $id): bool
     /**
      * 获取子孙menus.
      */
-    public function getDescendantsMenus(int $parentId): array
+    public function getDescendantsMenus(int $id): array
     {
-        $params = ['level' => $parentId];
+        $params = ['level' => $id];
         return $this->handleSearch($this->model::query(), $params)->get()->toArray();
     }
 

diff --git a/app/System/Service/SystemDeptService.php b/app/System/Service/SystemDeptService.php
@@ -93,7 +93,23 @@ public function save(array $data): mixed
      */
     public function update(mixed $id, array $data): bool
     {
-        return $this->mapper->update($id, $this->handleData($data));
+        $handleData = $this->handleData($data);
+        if (! $this->checkChildrenExists($id)) {
+            return $this->mapper->update($id, $handleData);
+        }
+        $update[] = [
+            'id' => $id,
+            'data' => $handleData,
+        ];
+        $descendants = $this->mapper->getDescendantsDepts((int) $id);
+        foreach ($descendants as $descendant) {
+            $handleDescendantDeptLevelData = $this->handleDescendantDeptLevels($descendant['level'], $handleData['level'], $id);
+            $update[] = [
+                'id' => $descendant['id'],
+                'data' => ['level' => $handleDescendantDeptLevelData],
+            ];
+        }
+        return $this->mapper->batchUpdate($update);
     }
 
     /**
@@ -144,4 +160,13 @@ protected function handleData(array $data): array
 
         return $data;
     }
+
+    protected function handleDescendantDeptLevels(string $descendantLevel, string $handleDataLevel, int $id): string
+    {
+        $descendantLevelArr = explode(',', $descendantLevel);
+        $handleDataLevelArr = explode(',', $handleDataLevel);
+        $position = array_search($id, $descendantLevelArr);
+        array_splice($descendantLevelArr, 0, $position, $handleDataLevelArr);
+        return implode(',', $descendantLevelArr);
+    }
 }