Pārlūkot izejas kodu

私有渠道排序修改

anderx 3 gadi atpakaļ
vecāks
revīzija
efa68a6cf7

+ 2 - 10
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.customer.bo.*;
 import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.app.bo.UserBasicInfo;
@@ -19,13 +20,6 @@ import com.goafanti.user.bo.UserInterestBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.common.model.UserExample;
-import com.goafanti.customer.bo.BusinessListBo;
-import com.goafanti.customer.bo.CustomerListOut;
-import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
-import com.goafanti.customer.bo.CustomerPersonalDetailBo;
-import com.goafanti.customer.bo.CustomerSimpleBo;
-import com.goafanti.customer.bo.FollowBusinessBo;
-import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.report.bo.CountMarketingStatisticsBo;
 import com.goafanti.report.bo.marketingESBo;
 import com.goafanti.report.bo.userDataListBo;
@@ -245,7 +239,5 @@ public interface UserMapper {
     List<CustomerListOut> selectPrivateOrganizationCustomerList(Map<String,Object> map);
 
 
-
-
-
+    List<OutChannelListBo> channelUserList(Map<String, Object> params);
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1502,12 +1502,12 @@
 		select b.id,b.nickname as name from
 			(select uid from user_lock_release  where type = 0  and status = 0 and aid = #{aid} group by uid) a
 		inner join user b on a.uid = b.id
-			where b.status != 1 and b.channel =0 and b.nickname like concat('%',#{name},'%')
+			where b.status != 1 and b.channel =0  and new_channel=0 and b.nickname like concat('%',#{name},'%')
     </select>
 
     <select id="selectSignedCustomerByName"  resultType="com.goafanti.customer.bo.CustomerSimpleBo">
    	 	select b.id,b.nickname as name from user b
-	where b.status != 1
+	where b.status != 1 b.new_channel=0
 	<if test="type==2">
 	and b.channel=1
 	</if>

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2447,7 +2447,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public List<OutChannelListBo> selectChannelUserList(InputChannelListBo in) {
 		Map<String, Object> params = new HashMap<>();
 		addParams(in, params);
-		return (List<OutChannelListBo>) findList("channelUserList",params,1,9999);
+		return userMapper.channelUserList(params);
 	}