diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertUserFullInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertUserFullInfo.java index 0516acb..f2d426c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertUserFullInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertUserFullInfo.java @@ -17,8 +17,8 @@ import java.time.LocalDateTime; * @author Liuxinxin * @since 2023-02-22 */ -@TableName("nd_expert_user_full_info") @Data +@TableName("nd_expert_user_full_info") @ApiModel(value = "NdExpertUserFullInfo对象", description = "") public class ExpertUserFullInfo implements Serializable { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java index df85d9b..090bde0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java @@ -281,7 +281,7 @@ public class ExpertInviteManage { LambdaQueryWrapper query = buildBaseExpertQuery(); query.notIn(!tmpAvoidCompany.isEmpty(), ExpertUserFullInfo::getCompany, tmpAvoidCompany); if (avoidCompany) { - query.notExists("select 1 from expert_avoid_company eac where eac.user_id = expert_user_full_info.user_id" + + query.notExists("select 1 from expert_avoid_company eac where eac.user_id = nd_expert_user_full_info.user_id" + " and company_name in ({0})", CollUtils.joinByComma(avoidRule.getAvoidUnitIdList())); } // 处理专家层级 @@ -357,7 +357,7 @@ public class ExpertInviteManage { } LambdaQueryWrapper query = buildBaseExpertQuery(); query.notIn(ExpertUserFullInfo::getCompany, avoidRule.getAvoidUnitIdList()); - query.notExists("select 1 from expert_avoid_company eac where eac.user_id = expert_user_full_info.user_id" + + query.notExists("select 1 from expert_avoid_company eac where eac.user_id = nd_expert_user_full_info.user_id" + " and company_name in ({0})", CollUtils.joinByComma(avoidRule.getAvoidOrgIdList())); // 处理专家层级