修改 认证成功后添加角色

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

@@ -42,6 +42,7 @@ public class PartyMemberServiceImpl implements PartyMemberService {
 		partyMemberInfo.setGridId(fromDTO.getGridId());
 		partyMemberInfo.setUserId(tokenDto.getUserId());
 		partyMemberInfo.setPartymemberVisitId(fromDTO.getVisitId());
+		partyMemberInfo.setApp(tokenDto.getApp());
 		return resiPartymemberFeignClient.submit(partyMemberInfo);
 	}
 

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java

@@ -154,4 +154,9 @@ public class PartymemberInfoDTO implements Serializable {
 	 */
 	private String code;
 
+	/**
+	 * 所属端
+	 */
+	private String app;
+
 }

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

@@ -158,6 +158,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER);
+			userRole.setApp(partyMemberInfoDTO.getApp());
 			epmetUserFeignClient.saveUserRole(userRole);
 			//存入党员注册关系表  用于统计客户网格的认证党员数
 			saveRegisterRelation(partyMemberInfoDTO);

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

@@ -20,11 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.UserConstant;
 import com.epmet.dao.UserRoleDao;
 import com.epmet.dto.RoleDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -122,10 +121,10 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result saveUserRole(UserRoleDTO userRoleDTO) {
 		//获取角色ID
 		RoleDTO roleDTO = new RoleDTO();
-		roleDTO.setApp(UserConstant.APP_RESI);
 		roleDTO.setRoleKey(userRoleDTO.getRoleKey());
 		RoleDTO role = roleService.getRoleByKey(roleDTO);
 		userRoleDTO.setRoleId(role.getId());