diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java index eb405bb..4820ea7 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java @@ -1,19 +1,7 @@ package com.baiye.modules.distribute.mapper; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.DirectClueEntity; import com.baiye.modules.distribute.entity.TagEntity; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.vo.DirectClueVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; /** * @author Enzo diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java index 82dbbd8..81e54b7 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java @@ -267,7 +267,6 @@ public class ClueServiceImpl extends ExtendServiceImpl i @Override public List selectListByUserId(List userIdList) { - List clueEntityList = baseMapper.selectList(Wrappers.lambdaQuery(ClueEntity.class).in (ClueEntity::getAssignedBy, userIdList).eq(ClueEntity::getDeleted, DefaultNumberConstants.ZERO_NUMBER)); return Convert.toList(ClueVO.class,clueEntityList); diff --git a/admin/src/main/resources/mapper/ClueMapper.xml b/admin/src/main/resources/mapper/ClueMapper.xml index a3d1dff..ebbb964 100644 --- a/admin/src/main/resources/mapper/ClueMapper.xml +++ b/admin/src/main/resources/mapper/ClueMapper.xml @@ -55,7 +55,7 @@ from tb_clue where DATE_FORMAT(create_time, '%Y-%m-%d') >= #{qo.createStartTime} and DATE_FORMAT(create_time, '%Y-%m-%d') <= #{qo.createEndTime} - and company_id = #{qo.companyId} + and company_id = #{qo.companyId} and deleted = 0 and channel_type = #{qo.channelType} @@ -71,7 +71,7 @@ select count(1) from tb_clue where DATE_FORMAT(create_time, '%Y-%m-%d') = #{date} - and company_id = #{companyId} + and company_id = #{companyId} and deleted = 0