Merge remote-tracking branch 'origin/dev'

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();

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'