From f8f940b5bbbd17ee61cf8c23f5afcfa94a6f5cef Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Tue, 24 Dec 2024 13:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A2=B3=E8=B6=B3=E8=BF=B9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=B8=8E=E7=A2=B3=E8=B6=B3=E8=BF=B9=E8=AF=81=E4=B9=A6=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=BF=87=E6=BB=A4bug=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IotCarbonCertificateServiceImpl.java | 21 ++-----------------
 .../report/dto/IotCarbonResultReport.java     |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java
index 8e17d74..4a3090c 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java
@@ -50,19 +50,6 @@ public class IotCarbonCertificateServiceImpl extends BaseServiceImpl<IotCarbonCe
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params) {
-        String companyName = MapUtils.getString(params, "companyName");
-        List<Long> tenantCodes =
-                tenantDetailService
-                        .list(
-                                QueryWrapper.create()
-                                        .like(
-                                                SysTenantDetailEntity::getName,
-                                                companyName,
-                                                StringUtils::isNotBlank))
-                        .stream()
-                        .map(SysTenantDetailEntity::getId)
-                        .toList();
-
         String productName = MapUtils.getString(params, "productName");
         String certificationOrg = MapUtils.getString(params, "certificationOrg");
         Integer shared = MapUtils.getInteger(params, "shared");
@@ -78,12 +65,8 @@ public class IotCarbonCertificateServiceImpl extends BaseServiceImpl<IotCarbonCe
                         StringUtils::isNotBlank)
                 .in(
                         IotCarbonCertificateEntity::getTenantCode,
-                        tenantCodes,
-                        CollectionUtils.isNotEmpty(tenantCodes))
-                .eq(
-                        IotCarbonCertificateEntity::getTenantCode,
-                        -1,
-                        Objects.nonNull(companyName) && CollectionUtils.isEmpty(tenantCodes))
+                        List.of(UserContext.getTenantCode()),
+                        CollectionUtils.isNotEmpty( List.of(UserContext.getTenantCode())))
                 .eq(IotCarbonCertificateEntity::getShared, shared, Objects::nonNull);
         return queryWrapper;
     }
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java
index 8d239be..db969d8 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java
@@ -88,6 +88,6 @@ public class IotCarbonResultReport {
         if (Objects.isNull(value)) {
             return null;
         }
-        return value.multiply(BigDecimal.valueOf(100)).divide(count, 1, RoundingMode.HALF_UP);
+        return value.multiply(BigDecimal.valueOf(100)).divide(count, 4, RoundingMode.HALF_UP);
     }
 }