From fb936ae70a56bc8b08bf179508326411ae9f767f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 10 五月 2021 14:09:34 +0800
Subject: [PATCH] 增加实有人口修改功能

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index b224e35..a1055c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -416,10 +416,11 @@
         if(populationDO==null){
             return R.fail();
         }
+        String cardNo = populationDO.getCardNo();
         BeanUtils.copyProperties(vo,populationDO);
         try {
             //TODO 修改拦截器时候需要维护加密操作
-            if(!populationDO.getCardNo().equals(vo.getCardNo())){//判断是否修改身份证号码
+            if(!cardNo.equals(vo.getCardNo())){//判断是否修改身份证号码
                 //判断要修改的身份证号码是否已存在
                 ComMngPopulationDO cardNoDO = populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>()
                         .lambda().eq(ComMngPopulationDO::getCardNo,vo.getCardNo()));
@@ -427,8 +428,10 @@
                     return R.fail("您输入的身份证已存在,请重新输入");
                 }
                 populationDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey));
-                populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
+            }else{
+                populationDO.setCardNo(AESUtil.encrypt128(cardNo, aesKey));
             }
+            populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
         } catch (Exception e) {
             e.printStackTrace();
             return R.fail();

--
Gitblit v1.7.1