diff --git a/lib/feishuapi/feishuapi.class.php b/lib/feishuapi/feishuapi.class.php index 2cfb53db53..d98a80fd76 100644 --- a/lib/feishuapi/feishuapi.class.php +++ b/lib/feishuapi/feishuapi.class.php @@ -158,7 +158,7 @@ class feishuapi $index = 0; while(true) { - $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=true&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET")); + $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=false&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET")); if(isset($response->data->items)) { foreach($response->data->items as $key => $dept) diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php index 10ba85b7d3..db16fab972 100644 --- a/module/block/view/welcome.html.php +++ b/module/block/view/welcome.html.php @@ -24,7 +24,7 @@ .block-welcome.block-sm .col-right .tiles {border-left: none; padding-left: 0} .block-welcome.block-sm .tile-title {font-size: 12px; margin: 0 -10px;} .block-welcome .progress-group{margin-top: 42px;} -.block-welcome .progress{margin-top: 10px; width: 85%} +.block-welcome .progress{margin-top: 10px; width: 85%;} .block-welcome .user-welcome{margin-top: 28px !important;} .block-welcome .col-right{border-left: 1px solid #e5e8ec;} .block-welcome.block-sm .col-right {border: none;} @@ -32,6 +32,7 @@ .block-welcome .done-progress{display: inline-block; color: #5B606E; font-weight: 500;} .block-welcome .welcome-label{background: #ffebee; border: none;} .block-welcome.block-sm .left-today {margin-left: 0px;} +.block-welcome .progress-num{display: flex; justify-content: space-between; width: 85%;}
@@ -41,10 +42,12 @@