From c0cc74abc37a8b9b0319af135ac9a86d733e718a Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Tue, 20 Aug 2024 16:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=BE=A7bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=B0=E7=BB=84=E6=80=81?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CarbonPubProductionReportController.java  |  6 ++++
 .../CarbonPubProductionResultController.java  |  2 +-
 .../CarbonPubProductionReportServiceImpl.java |  3 +-
 modules/pom.xml                               |  1 +
 modules/visual-design/pom.xml                 | 31 +++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 modules/visual-design/pom.xml

diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java
index 9d5638d..d6d658c 100644
--- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java
+++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java
@@ -20,11 +20,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 产品碳足迹报告
@@ -68,6 +70,10 @@ public class CarbonPubProductionReportController {
             @Parameter(name = "tenantCode", description = "租户编码"),
     })
     public Result<List<CarbonPubProductionReportDTO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        Long tenantCode = MapUtils.getLong(params, "tenantCode");
+        if (Objects.isNull(tenantCode)) {
+            return new Result<List<CarbonPubProductionReportDTO>>().ok(List.of());
+        }
         List<CarbonPubProductionReportDTO> list = carbonPubProductionReportService.listAs(params, CarbonPubProductionReportDTO.class);
         return new Result<List<CarbonPubProductionReportDTO>>().ok(list);
     }
diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java
index 76a15c0..e2d74d0 100644
--- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java
+++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java
@@ -45,7 +45,7 @@ public class CarbonPubProductionResultController {
     public Result<List<CarbonPubLibRecordSimpleAgg>> getSimpleAggResult(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
         String tenantCodes = MapUtils.getString(params, "tenantCodes");
         if (StringUtils.isBlank(tenantCodes)) {
-            throw new IllegalArgumentException("租户编码不能为空");
+            return new Result<List<CarbonPubLibRecordSimpleAgg>>().ok(Collections.emptyList());
         }
         List<Long> tenantCodeList =
                 Arrays.stream(tenantCodes.split(",")).map(s -> Long.parseLong(s.trim())).toList();
diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java
index f2e7d8b..bc61c1e 100644
--- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java
+++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
@@ -76,7 +77,7 @@ public class CarbonPubProductionReportServiceImpl extends BaseServiceImpl<Carbon
                 .leftJoin(CARBON_PUB_PRODUCTION_REPORT_CONFIG_ENTITY)
                 .on(CARBON_PUB_PRODUCTION_REPORT_ENTITY.CONFIG_ID.eq(CARBON_PUB_PRODUCTION_REPORT_CONFIG_ENTITY.ID))
                 .eq(CarbonPubProductionReportEntity::getId, id, Objects::nonNull)
-                .in(CarbonPubProductionReportEntity::getProductId, productIds, CollectionUtils.isNotEmpty(productIds))
+                .in(CarbonPubProductionReportEntity::getProductId, productIds, ObjectUtils.isNotEmpty(productIds))
                 .ge(CarbonPubProductionReportEntity::getCreateDate, startTs, Objects::nonNull)
                 .le(CarbonPubProductionReportEntity::getCreateDate, endTs, Objects::nonNull)
                 .eq(CarbonPubProductionReportEntity::getTenantCode, tenantCode, Objects::nonNull);
diff --git a/modules/pom.xml b/modules/pom.xml
index a2638c2..eb93403 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -28,6 +28,7 @@
         <module>carbon-track</module>
         <module>carbon-public</module>
         <module>cqc-service</module>
+        <module>visual-design</module>
     </modules>
 
     <artifactId>modules</artifactId>
diff --git a/modules/visual-design/pom.xml b/modules/visual-design/pom.xml
new file mode 100644
index 0000000..dbccc95
--- /dev/null
+++ b/modules/visual-design/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.thing</groupId>
+        <artifactId>modules</artifactId>
+        <version>5.1</version>
+    </parent>
+
+    <groupId>com.thing.modules</groupId>
+    <artifactId>visual-design</artifactId>
+    <packaging>jar</packaging>
+    <name>ThingBI Server Modules visual-design</name>
+
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.thing.modules</groupId>
+            <artifactId>thing</artifactId>
+        </dependency>
+    </dependencies>
+</project>