From 281a169db896a6af865a7215335f277ac25380ae Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Wed, 17 Apr 2024 09:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E7=B4=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baiye/modules/distribute/mapper/TagMapper.java   | 12 ------------
 .../distribute/service/impl/ClueServiceImpl.java     |  1 -
 admin/src/main/resources/mapper/ClueMapper.xml       |  8 ++++++--
 3 files changed, 6 insertions(+), 15 deletions(-)

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<ClueMapper, ClueEntity> i
 
 	@Override
 	public List<ClueVO> selectListByUserId(List<Long> userIdList) {
-
 		List<ClueEntity> 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') &gt;= #{qo.createStartTime}
 		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
-		and company_id = #{qo.companyId}
+		and company_id = #{qo.companyId} and deleted = 0
 		<if test="qo.channelType!=null">
 			and channel_type = #{qo.channelType}
 		</if>
@@ -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
 	</select>
 
 	<select id="selectListByQo" resultType="com.baiye.modules.distribute.vo.ClueVO">
@@ -86,6 +86,7 @@
 		from tb_clue
 		where DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{qo.createStartTime}
 		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
+		and deleted = 0
 		<if test="qo.channelType!=null">
 			and channel_type = #{qo.channelType}
 		</if>
@@ -103,7 +104,9 @@
 		FROM tb_clue
 		where assigned_by = #{assignedBy}
 		  and create_by = #{createBy}
+		  and deleted = 0
 		group by custom_id
+
 	</select>
 	<select id="findCustomIdAndCreate" resultType="com.baiye.modules.distribute.vo.ClueVO">
 		SELECT
@@ -112,5 +115,6 @@
 		where ce.custom_id = #{customId}
 		and ce.create_by = #{createBy}
 		and ce.deleted = #{num}
+		and deleted = 0
 	</select>
 </mapper>