Merge branch 'test' into dev-lqc

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.java

@@ -1,10 +1,13 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Component;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.PostMapping;
+
 import java.util.List;
 
 /**
@@ -17,5 +20,5 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashOasBoxMapper extends BaseMapper<FosterwxCashOasBox> {
-    public List<FosterwxCashOasBox> getList(Page<FosterwxCashOasBox> pageObj);
+    public List<FosterwxCashOasBox> getList(Page<FosterwxCashOasBox> pageObj,@Param("params") PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.xml

@@ -25,6 +25,9 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox">
         SELECT * FROM pan_fosterwx_cash_oas_box
+        <where>
+            <if test="params.groupId != null">and group_id = #{params.groupId}</if>
+        </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

@@ -61,7 +61,7 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashOasBox> pageObj = new Page<FosterwxCashOasBox>(page, pagesize);
-        List<FosterwxCashOasBox> list = fosterwxCashOasBoxMapper.getList(pageObj);
+        List<FosterwxCashOasBox> list = fosterwxCashOasBoxMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashOasBox>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());