微信客户bug修复

linkwe-api/src/main/java/com/linkwechat/controller/WeCustomerUserController.java

@@ -39,14 +39,9 @@ public class WeCustomerUserController extends BaseController {
     @GetMapping("/findWeCustomerUserList")
     @ApiOperation(value = "查询微信客户列表(分页)",httpMethod = "GET")
     public TableDataInfo findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
-        List<WeCustomerUserVo> list = weCustomerUserService.findWeCustomerUserList(weCustomerUserQuery, TableSupport.buildPageRequest());
-        TableDataInfo dataTable = getDataTable(list);
-        //设置总条数
-        dataTable.setTotal(
-                weCustomerUserService.countWeCustomerUserList(weCustomerUserQuery)
-        );
-
-        return dataTable;
+        startPage();
+        List<WeCustomerUserVo> list = weCustomerUserService.findWeCustomerUserList(weCustomerUserQuery);
+        return getDataTable(list);
     }
 
 

linkwe-api/src/main/java/com/linkwechat/controller/WeUserController.java

@@ -47,14 +47,9 @@ public class WeUserController extends BaseController {
     @GetMapping("/findWeUserList")
     @ApiOperation(value = "询同步用户列表(分页)",httpMethod = "GET")
     public TableDataInfo findWeUserList(WeCuUserQuery weUserQuery) {
-        List<WeUserVo> list = weUserService.findWeUserList(weUserQuery, TableSupport.buildPageRequest());
-        TableDataInfo dataTable = getDataTable(list);
-        //设置总条数
-        dataTable.setTotal(
-                weUserService.countWeUserList(weUserQuery)
-        );
-
-        return dataTable;
+        startPage();
+        List<WeUserVo> list = weUserService.findWeUserList(weUserQuery);
+        return getDataTable(list);
     }
 
     /**

linkwe-service/src/main/java/com/linkwechat/mapper/WeCustomerUserMapper.java

@@ -15,31 +15,12 @@ import java.util.List;
 
 public interface WeCustomerUserMapper extends BaseMapper<WeCustomerUser> {
 
-    /**
-     * 分页获取微信客户id列表
-     *
-     * @param weCustomerUserQuery
-     * @param pageDomain
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wcu", name = "create_by_id", userid = "user_id"))
-    List<String> findWeCustomerUserListIds(@Param("weCustomerUserList")WeCustomerUserQuery weCustomerUserQuery, @Param("pageDomain") PageDomain pageDomain);
 
     /**
      * 微信客户列表接口
      *
-     * @param ids
      * @return
      */
-    List<WeCustomerUserVo> findWeCustomerUserList(@Param("ids") List<String> ids);
-
+    List<WeCustomerUserVo> findWeCustomerUserList(@Param("weCustomerUserList") WeCustomerUserQuery weCustomerUserQuery);
 
-    /**
-     * 微信客户客户总数统计
-     *
-     * @param weCustomerUserQuery
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wcu", name = "create_by_id", userid = "user_id"))
-    long countWeCustomerUserList(@Param("weCustomerUserList") WeCustomerUserQuery weCustomerUserQuery);
 }

linkwe-service/src/main/java/com/linkwechat/mapper/WeUserMapper.java

@@ -8,37 +8,17 @@ import com.linkwechat.domain.WeUser;
 import com.linkwechat.domain.customer.query.WeCuUserQuery;
 import com.linkwechat.domain.customer.vo.WeUserVo;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 public interface WeUserMapper extends BaseMapper<WeUser> {
 
-    /**
-     * 分页获取同步用户id列表
-     *
-     * @param weUserQuery
-     * @param pageDomain
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wur", name = "create_by_id", userid = "user_id"))
-    List<String> findWeUserListIds(@Param("weUserList") WeCuUserQuery weUserQuery, @Param("pageDomain") PageDomain pageDomain);
-
     /**
      * 同步用户列表接口
      *
-     * @param ids
+     * @param weCuUserQuery
      * @return
      */
-    List<WeUserVo> findWeUserList(@Param("ids") List<String> ids);
+    List<WeUserVo> findWeUserList(@Param("weUserList") WeCuUserQuery weCuUserQuery);
 
-
-    /**
-     * 客户总数统计
-     *
-     * @param weUserQuery
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wur", name = "create_by_id", userid = "user_id"))
-    long countWeUserList(@Param("weUserList") WeCuUserQuery weUserQuery);
 }

linkwe-service/src/main/java/com/linkwechat/service/IWeCustomerUserService.java

@@ -17,15 +17,8 @@ public interface IWeCustomerUserService  extends IService<WeCustomerUser> {
      * @param weCustomerUserQuery
      * @return
      */
-    List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery, PageDomain pageDomain);
+    List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery);
 
-    /**
-     * 微信客户总数统计
-     *
-     * @param weCustomerUserQuery
-     * @return
-     */
-    long countWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery);
 
     /**
      * 微信客户详情
@@ -46,4 +39,6 @@ public interface IWeCustomerUserService  extends IService<WeCustomerUser> {
      * @param id
      */
     void unbindUser(String id);
+
+
 }

linkwe-service/src/main/java/com/linkwechat/service/IWeUserService.java

@@ -17,15 +17,7 @@ public interface IWeUserService extends IService<WeUser> {
      * @param weUserQuery
      * @return
      */
-    List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery, PageDomain pageDomain);
-
-    /**
-     * 同步用户总数统计
-     *
-     * @param weUserQuery
-     * @return
-     */
-    long countWeUserList(WeCuUserQuery weUserQuery);
+    List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery);
 
     /**
      * 分配/转出
@@ -41,4 +33,5 @@ public interface IWeUserService extends IService<WeUser> {
      * @return
      */
     WeUserDetailInfoVo findWeUserBaseInfo(String id);
+
 }

linkwe-service/src/main/java/com/linkwechat/service/impl/WeCustomerUserServiceImpl.java

@@ -34,23 +34,12 @@ public class WeCustomerUserServiceImpl extends ServiceImpl<WeCustomerUserMapper,
     private IWeUserService weUserService;
 
     @Override
-    public List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery, PageDomain pageDomain) {
-
-        List<WeCustomerUserVo> weCustomerUserVos = new ArrayList<>();
-        List<String> ids = this.baseMapper.findWeCustomerUserListIds(weCustomerUserQuery, pageDomain);
-
-        if (CollectionUtil.isNotEmpty(ids)) {
-            weCustomerUserVos = this.baseMapper.findWeCustomerUserList(ids);
-        }
+    public List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
 
+        List<WeCustomerUserVo> weCustomerUserVos = this.baseMapper.findWeCustomerUserList(weCustomerUserQuery);
         return weCustomerUserVos;
     }
 
-    @Override
-    public long countWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
-        return this.baseMapper.countWeCustomerUserList(weCustomerUserQuery);
-    }
-
     @Override
     public WeCustomerUserDetailInfoVo findWeCustomerUserBaseInfo(String id) {
         WeCustomerUserDetailInfoVo weCustomerUserDetailInfoVo = new WeCustomerUserDetailInfoVo();

linkwe-service/src/main/java/com/linkwechat/service/impl/WeUserServiceImpl.java

@@ -21,23 +21,11 @@ public class WeUserServiceImpl extends ServiceImpl<WeUserMapper, WeUser> impleme
 
 
     @Override
-    public List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery, PageDomain pageDomain) {
-
-        List<WeUserVo> weUserVos = new ArrayList<>();
-        List<String> ids = this.baseMapper.findWeUserListIds(weUserQuery, pageDomain);
-
-        if (CollectionUtil.isNotEmpty(ids)) {
-            weUserVos = this.baseMapper.findWeUserList(ids);
-        }
-
+    public List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery) {
+        List<WeUserVo> weUserVos = this.baseMapper.findWeUserList(weUserQuery);
         return weUserVos;
     }
 
-    @Override
-    public long countWeUserList(WeCuUserQuery weUserQuery) {
-        return this.baseMapper.countWeUserList(weUserQuery);
-    }
-
     @Override
     public void transferOwner(Long id, Long userId) {
         WeUser weUser = this.baseMapper.selectById(id);

linkwe-service/src/main/resources/mapper/wecom/WeCustomerUserMapper.xml

@@ -4,34 +4,17 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.linkwechat.mapper.WeCustomerUserMapper">
 
-    <select id="findWeCustomerUserListIds" resultType="java.lang.String">
-        SELECT wcu.id FROM we_customer_user wcu
-        <where>
-            <if test="weCustomerUserList.wxOpenid != null and weCustomerUserList.wxOpenid !=  ''">
-                AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
-            </if>
-            <if test="weCustomerUserList.userCode != null and weCustomerUserList.userCode != ''">
-                AND wcu.user_code = #{weCustomerUserList.userCode}
-            </if>
-            <if test="weCustomerUserList.wxNickname != null and weCustomerUserList.wxNickname != ''">
-                AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
-            </if>
-            <if test="weCustomerUserList.status != null">
-                AND wcu.status = #{weCustomerUserList.status}
-            </if>
-        </where>
-        ORDER BY wcu.create_time desc
-        <if test="pageDomain !=null">
-            <if test="pageDomain.pageNum !=null and pageDomain.pageSize !=null">
-                limit ${pageDomain.pageSize * (pageDomain.pageNum-1)}, #{pageDomain.pageSize}
-            </if>
-        </if>
-
-    </select>
-
-    <select id="countWeCustomerUserList" resultType="long">
+    <select id="findWeCustomerUserList" resultType="com.linkwechat.domain.customer.vo.WeCustomerUserVo">
         SELECT
-        count(0)
+        wcu.id,
+        wcu.user_code as userCode,
+        wcu.wx_phone as wxPhone,
+        wcu.wx_nickname as wxNickname,
+        wcu.wx_avatar as wxAvatar,
+        wcu.wx_openid as wxOpenid,
+        wcu.bind_time as bindTime,
+        wcu.create_time as createTime,
+        wcu.`status`
         FROM we_customer_user wcu
         <where>
             <if test="weCustomerUserList.wxOpenid != null and weCustomerUserList.wxOpenid !=  ''">
@@ -47,27 +30,6 @@
                 AND wcu.status = #{weCustomerUserList.status}
             </if>
         </where>
-
-    </select>
-
-
-    <select id="findWeCustomerUserList" resultType="com.linkwechat.domain.customer.vo.WeCustomerUserVo">
-        SELECT
-        wcu.id,
-        wcu.user_code as userCode,
-        wcu.wx_phone as wxPhone,
-        wcu.wx_nickname as wxNickname,
-        wcu.wx_avatar as wxAvatar,
-        wcu.wx_openid as wxOpenid,
-        wcu.bind_time as bindTime,
-        wcu.create_time as createTime,
-        wcu.`status`
-        FROM we_customer_user wcu
-        WHERE
-        wcu.id in
-        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
         ORDER BY wcu.create_time desc
     </select>
 </mapper>

linkwe-service/src/main/resources/mapper/wecom/WeUserMapper.xml

@@ -3,43 +3,24 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.linkwechat.mapper.WeUserMapper">
-
-    <select id="findWeUserListIds" resultType="java.lang.String">
-        SELECT wur.id FROM we_user wur
-        <where>
-            <if test="weUserList.userCode != null and weUserList.userCode != ''">
-                AND wur.user_code=#{weUserList.userCode}
-            </if>
-            <if test="weUserList.name != null and weUserList.name != ''">
-                AND wur.name=#{weUserList.name}
-            </if>
-            <if test="weUserList.phone != null and weUserList.phone != ''">
-                AND wur.phone=#{weUserList.phone}
-            </if>
-
-            <if test="weUserList.source != null">
-                AND wur.source=#{weUserList.source}
-            </if>
-            <if test="weUserList.status != null">
-                AND wur.status=#{weUserList.status}
-            </if>
-            <if test="weUserList.deliveredStatus != null">
-                AND wur.delivered_status=#{weUserList.deliveredStatus}
-            </if>
-        </where>
-        ORDER BY wur.create_time desc
-        <if test="pageDomain !=null">
-            <if test="pageDomain.pageNum !=null and pageDomain.pageSize !=null">
-                limit ${pageDomain.pageSize * (pageDomain.pageNum-1)}, #{pageDomain.pageSize}
-            </if>
-        </if>
-
-    </select>
-
-    <select id="countWeUserList" resultType="long">
+    <select id="findWeUserList" resultType="com.linkwechat.domain.customer.vo.WeUserVo">
         SELECT
-        count(0)
-        FROM we_user wur
+        wur.id,
+        wur.user_code as userCode,
+        wur.name ,
+        wur.sex ,
+        wur.birthday,
+        wur.phone,
+        wur.source,
+        wur.status,
+        wur.delivered_status as deliveredStatus,
+        wur.type,
+        wur.owner_user_id as ownerUserId,
+        wur.register_time as registerTime,
+        wur.add_time as addTime,
+        wur.last_Interaction_time as lastInteractionTime
+        FROM
+            we_user wur
         <where>
             <if test="weUserList.userCode != null and weUserList.userCode != ''">
                 AND wur.user_code=#{weUserList.userCode}
@@ -61,33 +42,6 @@
                 AND wur.delivered_status=#{weUserList.deliveredStatus}
             </if>
         </where>
-
-    </select>
-
-
-    <select id="findWeUserList" resultType="com.linkwechat.domain.customer.vo.WeUserVo">
-        SELECT
-            wu.id,
-            wu.user_code as userCode,
-            wu.name ,
-            wu.sex ,
-            wu.birthday,
-            wu.phone,
-            wu.source,
-            wu.status,
-            wu.delivered_status as deliveredStatus,
-            wu.type,
-            wu.owner_user_id as ownerUserId,
-            wu.register_time as registerTime,
-            wu.add_time as addTime,
-            wu.last_Interaction_time as lastInteractionTime
-        FROM
-            we_user wu
-        WHERE
-            wu.id in
-            <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        ORDER BY wu.create_time desc
+        ORDER BY wur.create_time desc
     </select>
 </mapper>