From 28a750a2dc3c4243af0dacb3f6ec79fd5620c0fb Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Wed, 14 Aug 2024 18:36:52 +0800
Subject: [PATCH] =?UTF-8?q?CQC=20=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81bug?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java     | 4 +---
 .../service/impl/CqcCarbonReportServiceImpl.java              | 4 +++-
 .../src/main/resources/mapper/CqcCarbonReportMapper.xml       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
index 84e819d..6501a35 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
@@ -1,13 +1,11 @@
 package com.thing.cqc.cqcCarbonReport.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportCountInfo;
 import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportCountParam;
 import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import java.util.Map;
 
 /**
 * 申请表基础数据
@@ -18,5 +16,5 @@ import java.util.Map;
 @Mapper
 public interface CqcCarbonReportMapper extends PowerBaseMapper<CqcCarbonReportEntity> {
 
-    List<CqcCarbonReportCountParam> countByStatus();
+    List<CqcCarbonReportCountParam> countByStatus(Long tCode);
 }
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
index 10b3e6e..84a3db4 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
@@ -123,8 +123,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportM
     public CqcCarbonReportCountInfo countByStatus() {
 
         CqcCarbonReportCountInfo cqcCarbonReportCountInfo = new CqcCarbonReportCountInfo();
+        Long tCode = UserContext.getTenantCode();
 
-        List<CqcCarbonReportCountParam> list = mapper.countByStatus();
+
+        List<CqcCarbonReportCountParam> list = mapper.countByStatus(tCode);
 
         list.forEach(temp->{
             if(temp.getStatus().equals("1")){
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
index 6ab0cca..80f1677 100644
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
@@ -11,6 +11,7 @@
             status,"count"(status) as count
         FROM
             cqc_carbon_report
+        WHERE tenant_code = #{tCode}
         GROUP BY status;
     </select>
 </mapper>
\ No newline at end of file