From 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 03 九月 2021 18:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 01cfc59..e9719f8 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
@@ -92,7 +92,7 @@
lastestOne.setIdCard(null);
lastestOne.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
lastestOne.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
- lastestOne.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
+ lastestOne.setIsBigAge(Objects.equals("是", e.getIsBigAge()) ? 1 : 2);
lastestOne.setUpdateAt(new Date());
listUpdateDO.add(lastestOne);
} else {
@@ -103,7 +103,7 @@
comEldersAuthElderlyDO.setCreateBy(createBy);
comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
comEldersAuthElderlyDO.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
- comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
+ comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是", e.getIsBigAge()) ? 1 : 2);
comEldersAuthElderlyDO.setBirthday(e.getBirthday());
comEldersAuthElderlyDO.setLevel(e.getLevel());
listNewDO.add(comEldersAuthElderlyDO);
@@ -145,15 +145,22 @@
@Override
public R updateEldersAuthElderly(EldersAuthElderlyDTO eldersAuthElderlyDTO) {
ComEldersAuthElderlyDO comEldersAuthElderlyDO = this.baseMapper.selectById(eldersAuthElderlyDTO.getId());
+ if(comEldersAuthElderlyDO == null){
+ return R.fail("未查询到该老人信息");
+ }
if (!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())) {
comEldersAuthElderlyDO.setName(eldersAuthElderlyDTO.getName());
}
- if (eldersAuthElderlyDTO.getIsExist() != null && eldersAuthElderlyDTO.getIsExist().intValue() != 1
- && eldersAuthElderlyDTO.getIsExist() != 2) {
- return R.fail("参数错误，是否健在只能为1或2");
- }
comEldersAuthElderlyDO.setIsExist(eldersAuthElderlyDTO.getIsExist());
comEldersAuthElderlyDO.setIsBigAge(eldersAuthElderlyDTO.getIsBigAge());
+ if (!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getIdCard())) {
+ try {
+ String idCard = AESUtil.encrypt128(eldersAuthElderlyDTO.getIdCard(), aesKey);
+ comEldersAuthElderlyDO.setIdCard(idCard);
+ } catch (Exception exp) {
+ log.error("身份证转义失败");
+ }
+ }
baseMapper.updateEldersAuthElderly(comEldersAuthElderlyDO);
return R.ok();
}
--
Gitblit v1.7.1