From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
index ad01206..12f89f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
@@ -47,20 +46,22 @@
public R saveBatchDisabledPerson(List<DisabledPersonsDTO> list) {
list.forEach(disabledPersonsDTO -> {
DisabledPersonsDO dbKeyPerson = checkExistFromDb(disabledPersonsDTO);
+ ComMngPopulationDO population = comMngPopulationService.getPopulationByCardNo(disabledPersonsDTO.getCardNo());
+ if (population != null) {
+ disabledPersonsDTO.setUserId(population.getId());
+ }
if (dbKeyPerson != null) {
//已经存在数据，进行数据更新操作
DisabledPersonsDO disabledPersonsDO = new DisabledPersonsDO();
BeanUtils.copyProperties(disabledPersonsDTO, disabledPersonsDO);
disabledPersonsDO.setId(dbKeyPerson.getId());
- ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO = new ComMngPopulationTagCardNoDTO();
- comMngPopulationTagCardNoDTO.setCardNo(dbKeyPerson.getCardNo());
- ComMngPopulationDO population = comMngPopulationService.getPopulationByCardNo(disabledPersonsDTO.getCardNo());
- if (population != null) {
- disabledPersonsDO.setUserId(population.getId());
- }
try {
String aesCardNo = AESUtil.encrypt128(disabledPersonsDTO.getCardNo(), aesKey);
+ String phone = AESUtil.encrypt128(disabledPersonsDTO.getPhone(), aesKey);
+ String guardianPhone = AESUtil.encrypt128(disabledPersonsDTO.getGuardianPhone(), aesKey);
disabledPersonsDO.setCardNo(aesCardNo);
+ disabledPersonsDO.setPhone(phone);
+ disabledPersonsDO.setGuardianPhone(guardianPhone);
updateById(disabledPersonsDO);
} catch (Exception e) {
log.error("根据身份证查询残疾人群业务-加密证件信息出错");
@@ -84,7 +85,6 @@
.eq("card_no", aesCardNo)
);
} catch (Exception e) {
-
log.error("根据身份证查询残疾人群业务-加密证件信息出错");
}
return null;
--
Gitblit v1.7.1