Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -140,20 +140,24 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 				PartymemberInfoEntity.class);
 
 		if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) {
+			//将访问记录更新到热心居民申请行为记录表
+			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
+
 			//自动认证失败
 			partyMemberInfoEntity.setConfirmResult("1");
 			partymemberInfoService.insert(partyMemberInfoEntity);
-			//将访问记录更新到热心居民申请行为记录表
+
-			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 			//TODO code待定
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName());
 		} else {
+			//将访问记录更新到热心居民申请行为记录表
+			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
+
 			//自动认证成功
 			partyMemberInfoEntity.setConfirmResult("0");
 			partymemberInfoService.insert(partyMemberInfoEntity);
-			//将访问记录更新到热心居民申请行为记录表
+
-			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
@@ -243,6 +247,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	 * @param operate 操作
 	 * @return String
 	 */
+	@Transactional(rollbackFor = Exception.class)
 	private String saveOrUpdateVisit(String visitId, PartyMemberInitFromDTO fromDTO, String operate) {
 		PartymemberVisitEntity partymemberVisitEntity = new PartymemberVisitEntity();
 		if (null == visitId) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

@@ -121,7 +121,6 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public Result saveUserRole(UserRoleDTO userRoleDTO) {
 		//获取角色ID
 		RoleDTO roleDTO = new RoleDTO();