修复后台检索酒店品牌重复问题

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -223,7 +223,8 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
         query.eqIfPresent(PersonInfoDO::getExpType, reqVO.getExpType());
         query.eqIfPresent(PersonInfoDO::getType, reqVO.getType());
         if(StringUtils.isNotBlank(reqVO.getBrand())){
-            query.innerJoin(WorkExpDO.class, on-> on.eq(WorkExpDO::getUserId, PersonInfoDO::getUserId).apply("MATCH(enterprise_Name) AGAINST('"+ reqVO.getBrand()+"*' IN BOOLEAN MODE)"));
+//            query.apply(" user_id in ( select user_id  from  mde_work_exp where MATCH(enterprise_Name) AGAINST(concat({0},'*') IN BOOLEAN MODE))",reqVO.getBrand());
+            query.innerJoin(WorkExpDO.class, on-> on.eq(WorkExpDO::getUserId, PersonInfoDO::getUserId).apply("MATCH(enterprise_Name) AGAINST({0}  IN BOOLEAN MODE)",reqVO.getBrand()+"*"));
         }
 
 //        query.and(StringUtils.isNotBlank(reqVO.getBrand()),

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/user/MdeUserMapper.java

@@ -97,7 +97,8 @@ public interface MdeUserMapper extends BaseMapperX<MdeUserDO> {
         ;
 
         if(StringUtils.isNotBlank(reqVO.getBrand())){
-            query.innerJoin(WorkExpDO.class, on-> on.eq(WorkExpDO::getUserId, PersonInfoDO::getUserId).apply("MATCH(enterprise_Name) AGAINST('"+ reqVO.getBrand()+"*' IN BOOLEAN MODE)"));
+            query.apply("t.id in ( select  ifnull(user_id,0)   from   mde_work_exp  where  MATCH(enterprise_name) AGAINST({0} IN BOOLEAN MODE) )  " ,reqVO.getBrand()+"*");
+//            query.innerJoin(WorkExpDO.class, on-> on.eq(WorkExpDO::getUserId, MdeUserDO::getId).apply("MATCH(enterprise_name) AGAINST({0} IN BOOLEAN MODE)",reqVO.getBrand()+"*"));
         }
 
 
@@ -122,6 +123,7 @@ public interface MdeUserMapper extends BaseMapperX<MdeUserDO> {
                         .like(PersonInfoDO::getForeignName, reqVO.getContent())
         );
 
+//        query.groupBy(MdeUserDO::getId);
 
         query.orderByDesc(PersonInfoDO::getUpdateTime);
         return selectJoinPage(reqVO, UserPersonRespVO.class, query);