From 8faf5b4e5373cda4e00274d54331b4a9267274d7 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sun, 28 Apr 2024 18:39:10 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safety/mapper/xml/EnterpriseScoreMapper.xml      |  2 +-
 .../service/impl/EnterpriseScoreServiceImpl.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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 @@
     </select>
 
     <select id="enterpriseNum" resultType="java.lang.Integer">
-        SELECT COUNT(enterprise_sn) FROM enterprise_score ${ew.customSqlSegment} GROUP BY enterprise_sn
+        SELECT COUNT(enterprise_sn) FROM enterprise_score ${ew.customSqlSegment}
     </select>
 </mapper>
\ 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<EnterpriseScoreMappe
         Integer enterpriseType = MapUtils.getInteger(map, "enterpriseType");
         String enterpriseName = MapUtils.getString(map, "enterpriseName");
         Integer scoreFlag = MapUtils.getInteger(map, "scoreFlag");
-        LambdaQueryWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaQuery();
+        QueryWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>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<EnterpriseScore> page = PageUtil.getPage(map);
         Page<EnterpriseScoreDto> pageList = baseMapper.pageList(page, wrapper);