commit

xx-member/src/main/java/com/xxfc/member/controller/MemberInfoController.java

@@ -33,8 +33,8 @@ public class MemberInfoController {
     }
 
     @GetMapping("/all")
-    public TableResultResponse<MemberInfoVo> getAll(Integer page, Integer limit) {
-        return new TableResultResponse<MemberInfoVo>().data(memberInfoService.selectAll(page, limit));
+    public TableResultResponse<MemberInfoVo> getAll(String name, Integer page, Integer limit) {
+        return new TableResultResponse<MemberInfoVo>().data(memberInfoService.selectAll(name, page, limit));
     }
 
     @PutMapping("")

xx-member/src/main/java/com/xxfc/member/mapper/MemberInfoMapper.java

@@ -2,10 +2,13 @@ package com.xxfc.member.mapper;
 
 import com.xxfc.member.entity.MemberInfo;
 import com.xxfc.member.vo.MemberInfoVo;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
 
 public interface MemberInfoMapper extends Mapper<MemberInfo> {
     List<MemberInfoVo> selectVoAll();
+
+    List<MemberInfoVo> selectVoByName(@Param("name") String name);
 }
\ No newline at end of file

xx-member/src/main/java/com/xxfc/member/service/MemberInfoService.java

@@ -11,6 +11,7 @@ import com.xxfc.member.mapper.MemberFamilyInfoMapper;
 import com.xxfc.member.mapper.MemberInfoMapper;
 import com.xxfc.member.vo.MemberFamilyInfoVo;
 import com.xxfc.member.vo.MemberInfoVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,8 +86,14 @@ public class MemberInfoService extends BaseBiz<MemberInfoMapper, MemberInfo> {
     }
 
 
-    public PageInfo<MemberInfoVo> selectAll(Integer pageNum, Integer pageSize) {
+    public PageInfo<MemberInfoVo> selectAll(String name, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if (name != null) {
+            name = name.trim();
+            if (name.length() > 0) {
+                return new PageInfo<>(mapper.selectVoByName(name.trim()));
+            }
+        }
         return new PageInfo<>(mapper.selectVoAll());
     }
 

xx-member/src/main/resources/mapper/com/xxfc/member/mapper/MemberInfoMapper.xml

@@ -76,4 +76,8 @@
   <select id="selectFamilyInfoByMemberId" resultType="com.xxfc.member.entity.MemberFamilyInfo">
       select * from member_family_info where member_id = #{memberId}
     </select>
+  <select id="selectVoByName" resultMap="MemberInfoVoResultMap">
+    select * from member_info
+    where name = #{name}
+  </select>
 </mapper>
\ No newline at end of file

xx-member/src/test/java/com/xxfc/member/controller/MemberInfoControllerTest.java

@@ -120,7 +120,7 @@ public class MemberInfoControllerTest extends MemberApplicationTests {
 
     @Test
     public void t_004_getAll() {
-        TableResultResponse<MemberInfoVo> response = controller.getAll(1, 10);
+        TableResultResponse<MemberInfoVo> response = controller.getAll(null,1, 10);
         Assert.assertEquals(200, response.getStatus());
         Assert.assertTrue(response.getData().getRows().size() > 0);
     }