1

app/Controller/PublicController.php

@@ -1096,5 +1096,16 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getWebsiteTemplateInfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 获取所有的职能部门
+     * @return array
+     */
+    public function getAllDepartment()
+    {
+        $result = $this->publicServiceClient->getDepartment([]);
+        $result['data'] = PublicData::buildMenuTree($result['data']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
 }
 

app/Controller/WebsiteController.php

@@ -127,8 +127,8 @@ class WebsiteController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['website_url'] = json_encode($requireData['website_url']);
-        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):'';
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):[0];
         $requireData['website_column_id'] = isset($requireData['website_column_arr_id'])?end($requireData['website_column_arr_id']):'';
         $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id'])?json_encode($requireData['website_column_arr_id']):'';
         $result = $this->websiteServiceClient->updateWebsite((int)$requireData['id'],$requireData);

config/api/public.php

@@ -39,6 +39,7 @@ Router::addGroup(
         //获取职能部门
         Router::get('/getDepartment', [PublicController::class, 'getDepartment']);
 
+
         Router::post('/getZhinengbumenList', [PublicController::class, 'getZhinengbumenList']);
         Router::post('/addZhinengbumen', [PublicController::class, 'addZhinengbumen']);
         Router::post('/delZhinengbumen', [PublicController::class, 'delZhinengbumen']);
@@ -73,3 +74,11 @@ Router::addGroup(
     ['middleware' => [FooMiddleware::class]]
 );
 
+
+Router::addGroup(
+    '/public', function () {
+        //获取所有的职能部门
+        Router::get('/getAllDepartment', [PublicController::class, 'getAllDepartment']);
+    }
+);
+