spi-plugin:fix bs paginate add kind_codes.

Author: ljl

basic/src/spi/dto/spi_bs_dto.rs

@@ -106,6 +106,7 @@ pub struct SpiBsFilterReq {
     pub rel2: Option<RbumItemRelFilterReq>,
     pub private: Option<bool>,
     pub kind_code: Option<String>,
+    pub kind_codes: Option<Vec<String>>,
     pub kind_id: Option<String>,
     pub domain_code: Option<String>,
 }

basic/src/spi/serv/spi_bs_serv.rs

@@ -182,6 +182,13 @@ impl RbumItemCrudOperation<spi_bs::ActiveModel, SpiBsAddReq, SpiBsModifyReq, Spi
         if let Some(kind_code) = &filter.kind_code {
             query.and_where(Expr::col((rbum_kind::Entity, rbum_domain::Column::Code)).eq(kind_code.to_string()));
         }
+        if let Some(kind_codes) = &filter.kind_codes {
+            if kind_codes.len() == 1 {
+                query.and_where(Expr::col((rbum_kind::Entity, rbum_domain::Column::Code)).eq(kind_codes.first().unwrap().to_string()));
+            } else if !kind_codes.is_empty() {
+                query.and_where(Expr::col((rbum_kind::Entity, rbum_domain::Column::Code)).is_in(kind_codes));
+            }
+        }
         if let Some(kind_id) = &filter.kind_id {
             query.and_where(Expr::col((rbum_kind::Entity, rbum_domain::Column::Id)).eq(kind_id.to_string()));
         }

spi/spi-plugin/src/api/ci/plugin_ci_bs_api.rs

@@ -57,6 +57,7 @@ impl PluginCiBsApi {
         name: Query<Option<String>>,
         kind_id: Query<Option<String>>,
         kind_code: Query<Option<String>>,
+        kind_codes: Query<Option<String>>,
         app_tenant_id: Query<Option<String>>,
         page_number: Query<u32>,
         page_size: Query<u32>,
@@ -72,6 +73,11 @@ impl PluginCiBsApi {
             rel_item_id: Some(app_tenant_id),
             ..Default::default()
         });
+        let kind_codes: Option<Vec<String>> = if Some(kind_codes) = kind_codes.0 {
+            Some(kind_codes.split(",").map(|kind_code| kind_code.to_string()).collect())
+        } else {
+            None
+        };
         let result = SpiBsServ::paginate_items(
             &SpiBsFilterReq {
                 basic: RbumBasicFilterReq {
@@ -81,6 +87,7 @@ impl PluginCiBsApi {
                 },
                 kind_id: kind_id.0,
                 kind_code: kind_code.0,
+                kind_codes: kind_codes.clone(),
                 domain_code: Some(funs.module_code().to_string()),
                 rel,
                 ..Default::default()