This commit is contained in:
zhangchenbiao
2023-06-30 17:21:22 +08:00
parent 5736c4565a
commit eabbfd7310
2 changed files with 3 additions and 1 deletions

View File

@@ -126,7 +126,7 @@
from
sys_role r inner join enterprise_user_role e on r.role_id = e.role_id
where
e.user_id = #{userId} and r.deleted = 0
e.user_id = #{userId} and r.deleted = 0 and e.deleted = 0
limit 1
</select>

View File

@@ -199,6 +199,8 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
List<EnterpriseUserRoleDO> enterpriseUserRole = EnterpriseUserRoleDO.convertSyncDO(role.getRoleId(), new ArrayList<>(Arrays.asList(userDetail.getUserId())));
enterpriseUserRoleDAO.batchInsertOrUpdate(enterpriseUserRole);
enterpriseUserRoleDAO.deleteUserInRole(userDetail.getUserId(), DataSourceEnum.SYNC, role.getRoleId());
}else{
enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId());
}
EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap);
enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser)));