leon 4 年 前
コミット
cf496da9d8

+ 6 - 2
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -129,8 +129,12 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         if (null != corp) {
             res.setWxAppid(corp.getWxCorpid());
         }
-        List<FosterwxMobileWxfriend> friendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", res.getId()).orderByAsc("seq"));
-        res.setFriend(friendList);
+        PostBasePageHandle handle = new PostBasePageHandle();
+        handle.setMobileId(res.getId());
+        handle.setPage(1);
+        handle.setPagesize(9999);
+        ResHandle<List<FosterwxMobileWxfriend>> friendList = fosterwxMobileWxfriendService.getList(handle);
+        res.setFriend(friendList.getList());
 
         // 获取个微账号任务时间list
         List<FosterwxMobileTaskTimeList> fosterwxMobileTaskTimeLists = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, res.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1).orderByAsc(FosterwxMobileTaskTimeList::getId));

+ 2 - 0
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileWxfriendController.java

@@ -102,6 +102,7 @@ public class FosterwxMobileWxfriendController extends BaseController<FosterwxMob
         if (addFosterwxMobileHandle.getFriendIds() == null || addFosterwxMobileHandle.getFriendIds().size() <= 0){
             return AjaxResult.error(HttpMsg.error);
         }
+        addFosterwxMobileHandle.getFriendIds().removeIf(i -> i == 0);
         //.判断好友微信名称是否同样的超过3个
         VoltaHandle<String> res = fosterwxMobileWxfriendService.checkFriend(addFosterwxMobileHandle);
         if(res.getErr() != null){
@@ -130,6 +131,7 @@ public class FosterwxMobileWxfriendController extends BaseController<FosterwxMob
         if (addFosterwxMobileHandle.getFriendIds() == null || addFosterwxMobileHandle.getFriendIds().size() <= 0){
             return AjaxResult.error(HttpMsg.error);
         }
+        addFosterwxMobileHandle.getFriendIds().removeIf(i -> i == 0);
         //.好友验证
         VoltaHandle<String> res = fosterwxMobileWxfriendService.checkFriend(addFosterwxMobileHandle);
         if(res.getErr() != null){

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobileWxfriendMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
  */
 @Component
 public interface FosterwxMobileWxfriendMapper extends BaseMapper<FosterwxMobileWxfriend> {
-    public List<FosterwxMobileWxfriend> getList(Page<FosterwxMobileWxfriend> pageObj);
+    public List<FosterwxMobileWxfriend> getList(Page<FosterwxMobileWxfriend> pageObj,@Param("params")PostBasePageHandle handle);
     public List<FosterwxMobileWxfriend> getListPro(Page<FosterwxMobileWxfriend> pageObj, @Param("params")PostBasePageHandle handle);
     public List<FosterwxMobileWxfriend> export(Page<FosterwxMobileWxfriend> pageObj, @Param("params")PostBasePageHandle handle);
     public List<FosterwxWxfriend> getCanSwtichFriendList();

+ 4 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobileWxfriendMapper.xml

@@ -27,6 +27,10 @@
                B.next_start_at
                FROM pan_fosterwx_mobile_wxfriend as A
         left join pan_fosterwx_wxfriend as B on A.friend_id = B.id
+        <where>
+            <if test="params.mobileId">and A.mobile_id = #{params.mobileId}</if>
+        </where>
+        order by A.seq asc
     </select>
 
     <select id="getCanSwtichFriendList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxWxfriend">

+ 1 - 1
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileWxfriendServiceImpl.java

@@ -62,7 +62,7 @@ public class FosterwxMobileWxfriendServiceImpl extends ServiceImpl<FosterwxMobil
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxMobileWxfriend> pageObj = new Page<FosterwxMobileWxfriend>(page, pagesize);
-        List<FosterwxMobileWxfriend> list = fosterwxMobileWxfriendMapper.getList(pageObj);
+        List<FosterwxMobileWxfriend> list = fosterwxMobileWxfriendMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxMobileWxfriend>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());