admin/smartDriveEE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

租户id修正

Browse Source
This commit is contained in:
cst61
2026-04-29 20:49:53 +08:00
parent 68d0c7ea37
commit 6fc319ac64
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/rj/controller/LbAssessmentApplyController.java
View File

@@ -60,7 +60,7 @@ public class LbAssessmentApplyController {
public ResponseEntity<Map<String, Object>> list( public ResponseEntity<Map<String, Object>> list(
@RequestParam(defaultValue = "1") Integer current, @RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "10") Integer size, @RequestParam(defaultValue = "10") Integer size,
@RequestParam(required = false) Long tenantId, @RequestParam(required = false) String tenantId,
@RequestParam(required = false) String applicantName, @RequestParam(required = false) String applicantName,
@RequestParam(required = false) String applicantPhone, @RequestParam(required = false) String applicantPhone,
@RequestParam(required = false) String colleagueName, @RequestParam(required = false) String colleagueName,

2
src/main/java/com/rj/entity/LbAssessmentApply.java
View File

@@ -24,7 +24,7 @@ public class LbAssessmentApply implements Serializable {
@TableField("tenant_id") @TableField("tenant_id")
@Schema(description = "租户ID") @Schema(description = "租户ID")
private Long tenantId; private String tenantId;
@TableField("applicant_name") @TableField("applicant_name")
@Schema(description = "申请人") @Schema(description = "申请人")

2
src/main/java/com/rj/service/ILbAssessmentApplyService.java
View File

@@ -15,7 +15,7 @@ public interface ILbAssessmentApplyService extends IService<LbAssessmentApply> {
Map<String, Object> pageQuery(Integer current, Map<String, Object> pageQuery(Integer current,
Integer size, Integer size,
Long tenantId, String tenantId,
String applicantName, String applicantName,
String applicantPhone, String applicantPhone,
String colleagueName, String colleagueName,

9
src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.rj.entity.LbAssessmentApply; import com.rj.entity.LbAssessmentApply;
import com.rj.mapper.LbAssessmentApplyMapper; import com.rj.mapper.LbAssessmentApplyMapper;
import com.rj.service.ILbAssessmentApplyService; import com.rj.service.ILbAssessmentApplyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -13,6 +14,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@Slf4j
@Service @Service
public class LbAssessmentApplyServiceImpl public class LbAssessmentApplyServiceImpl
extends ServiceImpl<LbAssessmentApplyMapper, LbAssessmentApply> extends ServiceImpl<LbAssessmentApplyMapper, LbAssessmentApply>
@@ -103,7 +105,7 @@ public class LbAssessmentApplyServiceImpl
@Override @Override
public Map<String, Object> pageQuery(Integer current, public Map<String, Object> pageQuery(Integer current,
Integer size, Integer size,
Long tenantId, String tenantId,
String applicantName, String applicantName,
String applicantPhone, String applicantPhone,
String colleagueName, String colleagueName,
@@ -118,8 +120,8 @@ public class LbAssessmentApplyServiceImpl
} }
LambdaQueryWrapper<LbAssessmentApply> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LbAssessmentApply> queryWrapper = new LambdaQueryWrapper<>();
if (tenantId != null) { if (tenantId != null && !tenantId.trim().isEmpty()) {
queryWrapper.eq(LbAssessmentApply::getTenantId, tenantId); queryWrapper.eq(LbAssessmentApply::getTenantId, tenantId.trim());
} }
if (applicantName != null && !applicantName.trim().isEmpty()) { if (applicantName != null && !applicantName.trim().isEmpty()) {
queryWrapper.like(LbAssessmentApply::getApplicantName, applicantName.trim()); queryWrapper.like(LbAssessmentApply::getApplicantName, applicantName.trim());
@@ -148,6 +150,7 @@ public class LbAssessmentApplyServiceImpl
} catch (Exception e) { } catch (Exception e) {
result.put("success", false); result.put("success", false);
result.put("message", "查询异常：" + e.getMessage()); result.put("message", "查询异常：" + e.getMessage());
log.error( "查询异常", e);
return result; return result;
} }
} }