更新

2026-04-23 18:31:29 +08:00
parent 31498b7891
commit d7aa984a31
266 changed files with 630 additions and 311 deletions
@@ -280,4 +280,61 @@ class DeptLogic extends BaseLogic
        return self::getTree($data, $pid);
    }

+    /**
+     * 指定部门及其全部下级部门 id（含自身）。筛选时选父级可匹配子级下成员（admin_dept.dept_id）。
+     *
+     * @return array<int>
+     */
+    public static function getSelfAndDescendantIds(int $rootDeptId): array
+    {
+        if ($rootDeptId <= 0) {
+            return [];
+        }
+        $rows = Dept::field(['id', 'pid'])->select()->toArray();
+        if ($rows === []) {
+            return [$rootDeptId];
+        }
+        $validIds = [];
+        foreach ($rows as $r) {
+            $id = (int) ($r['id'] ?? 0);
+            if ($id > 0) {
+                $validIds[$id] = true;
+            }
+        }
+        if (!isset($validIds[$rootDeptId])) {
+            return [$rootDeptId];
+        }
+        $childrenByPid = [];
+        foreach ($rows as $r) {
+            $pid = (int) ($r['pid'] ?? 0);
+            $id = (int) ($r['id'] ?? 0);
+            if ($id <= 0) {
+                continue;
+            }
+            if (!isset($childrenByPid[$pid])) {
+                $childrenByPid[$pid] = [];
+            }
+            $childrenByPid[$pid][] = $id;
+        }
+        $out = [];
+        $queue = [$rootDeptId];
+        $seen = [];
+        while ($queue !== []) {
+            $id = array_shift($queue);
+            if (isset($seen[$id])) {
+                continue;
+            }
+            $seen[$id] = true;
+            $out[] = $id;
+            foreach ($childrenByPid[$id] ?? [] as $cid) {
+                $cid = (int) $cid;
+                if ($cid > 0 && !isset($seen[$cid])) {
+                    $queue[] = $cid;
+                }
+            }
+        }
+
+        return $out;
+    }
+
 }
@@ -94,9 +94,9 @@ class DiagnosisLogic extends BaseLogic
            }

            // 表未增加 admin_id 列时勿写入，避免 SQL 报错（见 sql/1.9.20260421/add_tcm_diagnosis_admin_id.sql）
+            // 注意：Model::getConnection() 在 think-orm 中返回连接名（string），须用 Db 查询对象取字段
            if (array_key_exists('admin_id', $params)) {
-                $diagM = new Diagnosis();
-                $fieldNames = $diagM->getConnection()->getTableFields($diagM->getTable());
+                $fieldNames = Db::name('tcm_diagnosis')->getTableFields();
                if (! is_array($fieldNames) || ! in_array('admin_id', $fieldNames, true)) {
                    unset($params['admin_id']);
                }