diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml index 02ba4ef..69d2ee6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml @@ -32,6 +32,6 @@ \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java index beb6fe4..e180b8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java @@ -1,7 +1,7 @@ package com.zhgd.xmgl.modules.safety.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -54,18 +54,18 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); + QueryWrapper wrapper = Wrappers.query(); if (enterpriseType != null) { - wrapper.eq(EnterpriseScore::getEnterpriseType, enterpriseType); + wrapper.lambda().eq(EnterpriseScore::getEnterpriseType, enterpriseType); } if (StringUtils.isNotBlank(enterpriseName)) { - wrapper.like(EnterpriseScore::getEngineeringName, enterpriseName); + wrapper.like("p.enterprise_name", enterpriseName); } if (scoreFlag != null && scoreFlag == 1) { - wrapper.isNotNull(EnterpriseScore::getScore); + wrapper.lambda().isNotNull(EnterpriseScore::getScore); } if (scoreFlag != null && scoreFlag == 0) { - wrapper.isNull(EnterpriseScore::getScore); + wrapper.lambda().isNull(EnterpriseScore::getScore); } Page page = PageUtil.getPage(map); Page pageList = baseMapper.pageList(page, wrapper);