Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test

代码提交
2026-01-06 17:28:27 +08:00 · 2026-01-06 17:28:11 +08:00
1 changed files with 1 additions and 1 deletions
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml
@ -110,7 +110,7 @@
    <select id="getDeviceByDept" resultType="java.util.Map">
        SELECT
            sd.dept_id                         AS companyId,
-            sd.dept_abbreviation                AS companyName, -- 公司名称
+            ifnull(sd.dept_abbreviation, sd.dept_name)                AS companyName, -- 公司名称
               -- 工具数量：无数据则为0，取整
               ROUND(IFNULL(SUM(temp.toolNum), 0)) AS toolNum,
               -- 设备数量：无数据则为0，取整
Author	SHA1	Message	Date
itcast	c9e088548d	Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test	2026-01-06 17:28:27 +08:00
itcast	a569b1d758	代码提交	2026-01-06 17:28:11 +08:00