Merge branch 'main' of https://github.com/ideal-world/bios

ideal-world · May 11, 2024 · 56dcc75 · 56dcc75
2 parents 8cc107f + f613a8b
commit 56dcc75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/backend/spi/spi-stats/src/serv/pg/stats_pg_metric_serv.rs b/backend/spi/spi-stats/src/serv/pg/stats_pg_metric_serv.rs
@@ -762,7 +762,6 @@ fn package_groups(
     let mut node = Map::with_capacity(0);
 
     let dimension_key = curr_select_dimension_keys.first().ok_or_else(|| "curr_select_dimension_keys is empty")?;
-
     // todo 下钻 上探
     // let dimension_hierarchy = if let Some(stats_con_info) = conf_info.get(dimension_key.split(FUNCTION_SUFFIX_FLAG).next().unwrap_or("")) {
     //     stats_con_info.dim_hierarchy.clone()
@@ -774,7 +773,7 @@ fn package_groups(
     let mut order = Vec::new();
     for record in result {
         let key = {
-            let key = record.get(dimension_key).unwrap_or(&json!(null));
+            let key = record.get(dimension_key.to_lowercase()).unwrap_or(&json!(null));
             match key {
                 serde_json::Value::Null => "ROLLUP".to_string(),
                 serde_json::Value::String(s) => s.clone(),

diff --git a/backend/supports/iam/src/basic/serv/iam_account_serv.rs b/backend/supports/iam/src/basic/serv/iam_account_serv.rs
@@ -228,6 +228,8 @@ impl RbumItemCrudOperation<iam_account::ActiveModel, IamAccountAddReq, IamAccoun
         query.column((iam_account::Entity, iam_account::Column::Ext8));
         query.column((iam_account::Entity, iam_account::Column::Ext9));
         query.column((iam_account::Entity, iam_account::Column::EffectiveTime));
+        query.column((iam_account::Entity, iam_account::Column::LogoutTime));
+        query.column((iam_account::Entity, iam_account::Column::LogoutType));
         if let Some(icon) = &filter.icon {
             query.and_where(Expr::col(iam_account::Column::Icon).eq(icon.as_str()));
         }