From 730b892023215279cb728a76e1e399725f9402a8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 13 Jan 2021 15:41:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=85=9A=E5=91=98=E7=9A=84bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D=E2=91=A0=E6=95=B0=E6=8D=AE=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E6=9C=89=E4=BE=9D=E8=B5=96=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=89=A7=E8=A1=8C=E7=9A=84=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E7=94=9F=E6=88=90=E7=94=A8=E6=88=B7=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=86=8D=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=87=8C=E7=9A=84=E6=B3=A8=E5=86=8C=E7=BD=91?= =?UTF-8?q?=E6=A0=BCId=E8=BF=9B=E8=A1=8C=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BE=BD=E7=AB=A0=E2=91=A1=E5=9C=A8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E6=98=AF=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=B1=85=E6=B0=91=E6=97=B6=EF=BC=8C=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84baseInfo=EF=BC=8C=E5=B7=A6=E5=85=B3?= =?UTF-8?q?=E8=81=94resiInfo=EF=BC=8C=E5=BD=93baseInfo=E6=9C=89=E5=80=BC?= =?UTF-8?q?=E8=80=8CresiInfo=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BC=9A=E6=9F=A5?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=A2=AB=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=AD=A4=E6=97=B6=E7=94=A8=E6=88=B7=E5=B9=B6?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=88=90=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=B3=BB=E5=88=97=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=A6=E5=8F=91=E6=9B=B4=E6=96=B0=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=8AbaseInfo=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=86=85=E5=85=B3=E8=81=94=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E5=BD=93=E4=B8=A4=E8=BE=B9=E9=83=BD=E6=9C=89=E5=80=BC?= =?UTF-8?q?=E6=97=B6=E6=89=8D=E8=83=BD=E8=AE=A4=E5=AE=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=B3=A8=E5=86=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 6 +++--- .../src/main/resources/mapper/UserResiInfoDao.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index c30e9aca9f..eae2c74317 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -185,6 +185,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + //判断是否已注册居民，如果没有则注册居民 + isResiRegister(partyMemberInfoDTO); + //党员信息存入党员认证信息表 PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO, PartymemberInfoEntity.class); @@ -264,9 +267,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberConfirmAutoEntity.class)); } } - // - //判断是否已注册居民，如果没有则注册居民 - isResiRegister(partyMemberInfoDTO); //将身份证号更新到用户基础信息表中 UserBaseInfoDTO baseInfo = new UserBaseInfoDTO(); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 3e6adef055..1dca8f531b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -70,7 +70,7 @@ ubi.NICKNAME as nickName FROM user_base_info ubi - LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' ) + INNER JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' ) WHERE ubi.USER_ID =#{userId} AND ubi.DEL_FLAG = '0'