From f0eee761d8c240576fff1bb4e2accbca74e6f192 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Fri, 4 Jul 2025 16:43:58 +0800
Subject: [PATCH] =?UTF-8?q?fit:1=E3=80=81=E7=9D=A3=E5=AF=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=91=E5=B8=83=E5=90=8E=E7=AB=AFv2=EF=BC=88?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98=E7=9D=A3=E5=AF=9F=EF=BC=89?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/mobileSupervision/SupRiskPersonController.java | 2 ++
 .../biutag/supervision/service/SupRiskPersonalService.java    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SupRiskPersonController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SupRiskPersonController.java
index 6219a03..72565bd 100644
--- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SupRiskPersonController.java
+++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SupRiskPersonController.java
@@ -24,10 +24,12 @@ import java.util.List;
 public class SupRiskPersonController {
 
     private final SupRiskPersonalService supRiskPersonalService;
+
     @GetMapping
     Result<Page<SupRiskPersonalVo>> queryPage(SupRiskPersonalQueryParam queryParam){
         return Result.success(supRiskPersonalService.page(queryParam));
     }
+
     //保存督察记录
     @PostMapping("/saveSupRecord")
     Result saveSupRecord(@RequestBody SupRiskPersonalSupRecordDto supRecordDto){
diff --git a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java b/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java
index e5d5405..1075d1e 100644
--- a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java
+++ b/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java
@@ -45,8 +45,8 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
     public Page<SupRiskPersonalVo> page(SupRiskPersonalQueryParam queryParam) {
         QueryWrapper<SupRiskPersonal> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("srp.task_id", queryParam.getTaskId())
-                .like("srp.id_code",queryParam.getIdCode())
-                .like("srp.name",queryParam.getName())
+                .like(StrUtil.isNotEmpty(queryParam.getIdCode()),"srp.id_code",queryParam.getIdCode())
+                .like(StrUtil.isNotEmpty(queryParam.getName()),"srp.name",queryParam.getName())
                 .orderByAsc("srp.create_time");
         Page<SupRiskPersonalVo> page = baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         return page;