diff --git a/src/main/java/com/rj/controller/LbAssessmentApplyController.java b/src/main/java/com/rj/controller/LbAssessmentApplyController.java index 3b6cabd..53702a1 100644 --- a/src/main/java/com/rj/controller/LbAssessmentApplyController.java +++ b/src/main/java/com/rj/controller/LbAssessmentApplyController.java @@ -60,7 +60,7 @@ public class LbAssessmentApplyController { public ResponseEntity> list( @RequestParam(defaultValue = "1") Integer current, @RequestParam(defaultValue = "10") Integer size, - @RequestParam(required = false) Long tenantId, + @RequestParam(required = false) String tenantId, @RequestParam(required = false) String applicantName, @RequestParam(required = false) String applicantPhone, @RequestParam(required = false) String colleagueName, diff --git a/src/main/java/com/rj/entity/LbAssessmentApply.java b/src/main/java/com/rj/entity/LbAssessmentApply.java index f369427..9ac4263 100644 --- a/src/main/java/com/rj/entity/LbAssessmentApply.java +++ b/src/main/java/com/rj/entity/LbAssessmentApply.java @@ -24,7 +24,7 @@ public class LbAssessmentApply implements Serializable { @TableField("tenant_id") @Schema(description = "租户ID") - private Long tenantId; + private String tenantId; @TableField("applicant_name") @Schema(description = "申请人") diff --git a/src/main/java/com/rj/service/ILbAssessmentApplyService.java b/src/main/java/com/rj/service/ILbAssessmentApplyService.java index 3ca6e51..e2659e6 100644 --- a/src/main/java/com/rj/service/ILbAssessmentApplyService.java +++ b/src/main/java/com/rj/service/ILbAssessmentApplyService.java @@ -15,7 +15,7 @@ public interface ILbAssessmentApplyService extends IService { Map pageQuery(Integer current, Integer size, - Long tenantId, + String tenantId, String applicantName, String applicantPhone, String colleagueName, diff --git a/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java b/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java index 1790636..73086f6 100644 --- a/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.rj.entity.LbAssessmentApply; import com.rj.mapper.LbAssessmentApplyMapper; import com.rj.service.ILbAssessmentApplyService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -13,6 +14,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +@Slf4j @Service public class LbAssessmentApplyServiceImpl extends ServiceImpl @@ -103,7 +105,7 @@ public class LbAssessmentApplyServiceImpl @Override public Map pageQuery(Integer current, Integer size, - Long tenantId, + String tenantId, String applicantName, String applicantPhone, String colleagueName, @@ -118,8 +120,8 @@ public class LbAssessmentApplyServiceImpl } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (tenantId != null) { - queryWrapper.eq(LbAssessmentApply::getTenantId, tenantId); + if (tenantId != null && !tenantId.trim().isEmpty()) { + queryWrapper.eq(LbAssessmentApply::getTenantId, tenantId.trim()); } if (applicantName != null && !applicantName.trim().isEmpty()) { queryWrapper.like(LbAssessmentApply::getApplicantName, applicantName.trim()); @@ -148,6 +150,7 @@ public class LbAssessmentApplyServiceImpl } catch (Exception e) { result.put("success", false); result.put("message", "查询异常:" + e.getMessage()); + log.error( "查询异常", e); return result; } }