diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java index 64415d8..011ff2c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java @@ -33,7 +33,7 @@ public class CounselorExperienceVo implements Serializable { */ @ExcelProperty(value = "") private Long id; - + private Long counselorId; @Translation(type = TransConstant.USER_ID_TO_NICKNAME) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java index 8e9736f..b0938eb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java @@ -1,23 +1,22 @@ package org.dromara.scale.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.CounselorExperience; import org.dromara.scale.domain.bo.CounselorExperienceBo; import org.dromara.scale.domain.vo.CounselorExperienceVo; -import org.dromara.scale.domain.CounselorExperience; import org.dromara.scale.mapper.CounselorExperienceMapper; import org.dromara.scale.service.ICounselorExperienceService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 培训经历Service业务层处理 @@ -71,7 +70,7 @@ public class CounselorExperienceServiceImpl implements ICounselorExperienceServi private LambdaQueryWrapper buildQueryWrapper(CounselorExperienceBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getDescribe()), CounselorExperience::getDescribe, bo.getDescribe()); + //lqw.eq(StringUtils.isNotBlank(bo.getDescribe()), CounselorExperience::getDescribe, bo.getDescribe()); return lqw; }