From ba6b3496d504bf84a1515560b06d9f2c3f43f941 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 17 Mar 2025 15:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/device/mapper/DevInfoMapper.java      |  2 ++
 .../controller/LargeScreenController.java          | 14 ++++++++++----
 .../mapper/material/device/DevInfoMapper.xml       | 10 ++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
index 363c907..f49bea8 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
@@ -241,5 +241,7 @@ public interface DevInfoMapper {
     List<DevInfoVo> getOrderByCompanyId(String companyId);
 
     DevInfoVo getBuyCompanyList(DevInfoVo infoVo);
+
+    DevInfoVo selectDeptList(String companyId);
 }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
index ccafc09..dcee869 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
@@ -176,16 +176,22 @@ public class LargeScreenController {
                 // 根据订单id查询所买公司id和名称
                 DevInfoVo infoVo1 = devInfoMapper.getBuyCompanyList(infoVo);
                 // 如果 Map 中已经存在该公司 ID,则数量增加1
-                orderNumMap.compute(infoVo1.getCompanyId(), (key, value) -> value == null ? 1 : value + 1);
+                if (orderNumMap.containsKey(infoVo1.getCompanyId())) {
+                    orderNumMap.put(infoVo1.getCompanyId(), orderNumMap.get(infoVo1.getCompanyId()) + 1);
+                } else {
+                    orderNumMap.put(infoVo1.getCompanyId(), 1);
+                }
             }
         }
         // 根据orderNumMap去遍历查询公司名称
         if (CollectionUtil.isNotEmpty(orderNumMap)) {
             for (Map.Entry<String, Integer> entry : orderNumMap.entrySet()) {
                 DevInfoVo vo = new DevInfoVo();
-                DevInfoVo devInfoVo = devInfoMapper.selectCompanyById(entry.getKey());
-                vo.setCompanyId(devInfoVo.getCompanyId());
-                vo.setCompanyName(devInfoVo.getCompanyName());
+                DevInfoVo devInfoVo = devInfoMapper.selectDeptList(entry.getKey());
+                if (devInfoVo != null) {
+                    vo.setCompanyId(devInfoVo.getCompanyId());
+                    vo.setCompanyName(devInfoVo.getCompanyName());
+                }
                 vo.setOrderNum(entry.getValue());
                 infoVos.add(vo);
             }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 7661f89..057658c 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -1186,4 +1186,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
         WHERE moi.order_id = #{orderId}
     </select>
+    <select id="selectDeptList" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
+        SELECT
+            d.dept_id AS companyId,
+            d.dept_name AS companyName
+        FROM
+            sys_dept d
+        WHERE
+            d.dept_id = #{companyId}
+            AND d.del_flag = '0'
+    </select>
 </mapper>