From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
index 0fee7d5..6a82563 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
@@ -71,7 +71,11 @@
         List<ComEldersAuthElderlyDO> listNewDO = new ArrayList<>();
         List<ComEldersAuthElderlyDO> listUpdateDO = new ArrayList<>();
         list.forEach(e->{
-            String idCardEncrypted = e.getIdCard();
+            String idCardProto = e.getIdCard();
+            if(idCardProto!=null && idCardProto.contains("x")){
+                idCardProto = idCardProto.replaceAll("x", "X");
+            }
+            String idCardEncrypted = idCardProto;
             try {
                 idCardEncrypted = AESUtil.encrypt128(idCardEncrypted, aesKey);
             } catch (Exception exp) {

--
Gitblit v1.7.1