Merge branch 'test' into dev

hx-account/src/main/java/com/fjhx/account/controller/loan/LoanInfoController.java

@@ -8,7 +8,10 @@ import com.fjhx.account.entity.loan.vo.LoanInfoVo;
 import com.fjhx.account.service.loan.LoanInfoService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -39,9 +42,9 @@ public class LoanInfoController {
     /**
      * 借款人列表
      */
-    @GetMapping("/getLoanUserList")
-    public List<LoanInfo> getLoanUserList() {
-        return loanInfoService.getLoanUserList();
+    @PostMapping("/getLoanUserList")
+    public List<LoanInfo> getLoanUserList(@RequestBody LoanInfoSelectDto dto) {
+        return loanInfoService.getLoanUserList(dto);
     }
 
     /**

hx-account/src/main/java/com/fjhx/account/service/loan/LoanInfoService.java

@@ -28,7 +28,7 @@ public interface LoanInfoService extends BaseService<LoanInfo> {
     /**
      * 借款人列表
      */
-    List<LoanInfo> getLoanUserList();
+    List<LoanInfo> getLoanUserList(LoanInfoSelectDto dto);
 
     /**
      * 借款信息明细

hx-account/src/main/java/com/fjhx/account/service/loan/impl/LoanInfoServiceImpl.java

@@ -79,12 +79,13 @@ public class LoanInfoServiceImpl extends ServiceImpl<LoanInfoMapper, LoanInfo> i
      * 借款人列表
      */
     @Override
-    public List<LoanInfo> getLoanUserList() {
+    public List<LoanInfo> getLoanUserList(LoanInfoSelectDto dto) {
         List<LoanInfo> list = this.list(q -> q
                 .select(LoanInfo::getLoanUserName)
                 .groupBy(LoanInfo::getLoanUserName)
                 .isNotNull(LoanInfo::getLoanUserName)
                 .eq(LoanInfo::getCreateUser, SecurityUtils.getUserId())
+                .like(LoanInfo::getLoanUserName, dto.getKeyword())
         );
         return list;
     }