From 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 09:57:09 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 4ff8fed..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) {
@@ -157,7 +161,11 @@
@Override
public R deleteEldersAuthElderly(Long id) {
- this.baseMapper.deleteById(id);
- return R.ok();
+ if(this.baseMapper.deleteById(id) > 0){
+ //删除用户关联的老人信息
+ this.baseMapper.deleteEldersAuthUserById(id);
+ return R.ok();
+ }
+ return R.fail();
}
}
--
Gitblit v1.7.1