From 6c0af7790f972e8a186a88d67e408498903d9eeb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:44:42 +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/ComMngPopulationServiceImpl.java |    5 +++--
 1 files changed, 3 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 be123cc..4699ff0 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
@@ -434,9 +434,10 @@
             }
             String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
             //判断实有人口是否已存在
-            List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
-                    .eq(ComMngPopulationDO::getCardNo, cardNoAES).eq(ComMngPopulationDO::getActId,communityId));
             ComMngPopulationDO populationDO = null;
+            List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
+                    .eq(ComMngPopulationDO::getCardNo, cardNoAES));
+
             if (populationDOList.isEmpty()) {
                 //不存在实有人口,则新增
                 populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);

--
Gitblit v1.7.1