Merge pull request #531 from RWDai/optimization-ldap-sync

optimization ldap sync
ideal-world · Nov 21, 2023 · d0e3031 · d0e3031
2 parents 631c7a1 + b3b7d5d
commit d0e3031
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/middleware/flow/src/serv/flow_external_serv.rs b/middleware/flow/src/serv/flow_external_serv.rs
@@ -14,7 +14,7 @@ use crate::{
             FlowExternalReq, FlowExternalResp,
         },
         flow_state_dto::FlowSysStateKind,
-        flow_transition_dto::{TagRelKind, FlowTransitionActionByVarChangeInfoChangedKind},
+        flow_transition_dto::{FlowTransitionActionByVarChangeInfoChangedKind, TagRelKind},
     },
     flow_config::FlowConfig,
     flow_constants,
@@ -86,16 +86,19 @@ impl FlowExternalServ {
         }
 
         // complete changed_kind
-        let params = params.into_iter().map(|mut param| {
-            if param.changed_kind.is_none() {
-                if param.value.clone().unwrap_or_default().to_string().is_empty() {
-                    param.changed_kind = Some(FlowTransitionActionByVarChangeInfoChangedKind::Clean);
-                } else {
-                    param.changed_kind = Some(FlowTransitionActionByVarChangeInfoChangedKind::ChangeContent);
+        let params = params
+            .into_iter()
+            .map(|mut param| {
+                if param.changed_kind.is_none() {
+                    if param.value.clone().unwrap_or_default().to_string().is_empty() {
+                        param.changed_kind = Some(FlowTransitionActionByVarChangeInfoChangedKind::Clean);
+                    } else {
+                        param.changed_kind = Some(FlowTransitionActionByVarChangeInfoChangedKind::ChangeContent);
+                    }
                 }
-            }
-            param
-        }).collect_vec();
+                param
+            })
+            .collect_vec();
 
         let header = Self::headers(None, funs, ctx).await?;
         let body = FlowExternalReq {

diff --git a/support/iam/src/basic/serv/iam_cert_ldap_serv.rs b/support/iam/src/basic/serv/iam_cert_ldap_serv.rs
@@ -803,26 +803,28 @@ impl IamCertLdapServ {
                     )
                     .await?
                     {
-                        let modify_result = RbumCertServ::modify_rbum(
-                            &phone_cert.id,
-                            &mut RbumCertModifyReq {
-                                ak: Some(TrimString(iam_account_ext_sys_resp.mobile.clone())),
-                                sk: None,
-                                is_ignore_check_sk: false,
-                                ext: None,
-                                start_time: None,
-                                end_time: None,
-                                conn_uri: None,
-                                status: None,
-                            },
-                            &funs,
-                            ctx,
-                        )
-                        .await;
-                        if let Some(e) = modify_result.err() {
-                            let err_msg = format!("modify phone cert_id:{} failed:{}", phone_cert.id, e);
-                            tardis::log::error!("{}", err_msg);
-                            msg = format!("{msg}{err_msg}\n");
+                        if phone_cert.ak != iam_account_ext_sys_resp.mobile {
+                            let modify_result = RbumCertServ::modify_rbum(
+                                &phone_cert.id,
+                                &mut RbumCertModifyReq {
+                                    ak: Some(TrimString(iam_account_ext_sys_resp.mobile.clone())),
+                                    sk: None,
+                                    is_ignore_check_sk: false,
+                                    ext: None,
+                                    start_time: None,
+                                    end_time: None,
+                                    conn_uri: None,
+                                    status: None,
+                                },
+                                &funs,
+                                ctx,
+                            )
+                            .await;
+                            if let Some(e) = modify_result.err() {
+                                let err_msg = format!("modify phone cert_id:{} failed:{}", phone_cert.id, e);
+                                tardis::log::error!("{}", err_msg);
+                                msg = format!("{msg}{err_msg}\n");
+                            }
                         }
                     } else {
                         //添加手机号