Merge remote-tracking branch 'origin/master'

2025-08-15 18:22:59 +08:00
parent a3bf1ed9ca ce8bbfa6c1
commit 9202ad26d5
1 changed files with 5 additions and 1 deletions
--- a/app/czg/app/controller/HelpWordController.php
+++ b/app/czg/app/controller/HelpWordController.php
@@ -22,8 +22,12 @@ class HelpWordController extends Frontend
            ->where('types', $get['types'])->select()->toArray();
        $result = convertToCamelCase($result);
        foreach ($result as $k => $v) {
-            $result[$k]['helpWordList'] = Db::connect(config('think-orm.search_library'))->name('help_word')
+            $a = Db::connect(config('think-orm.search_library'))->name('help_word')
                ->where('help_classify_id', $v['helpClassifyId'])->select()->toArray();
+            foreach ($a as $k1 => &$v1) {
+                $v1 = convertToCamelCase($result);
+            }
+            $result[$k]['helpWordList'] = $a;
        }
        $this->success('ok', $result);
    }