公司简称

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java

@@ -37,6 +37,9 @@ public class BmCompanyInfo implements Serializable {
     @ApiModelProperty(value = "企业名称", required = true)
     private String companyName;
 
+    @ApiModelProperty(value = "企业简称", required = true)
+    private String companyAbbreviationName;
+
     /**
     * 企业类型(社会企业，南网集团企业，南网控股企业)
     */

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml

@@ -713,6 +713,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         sd.dept_id as companyId,
         sd.dept_name as companyName,
+        sd.dept_abbreviation as companyAbbreviationName,
         sd.is_show as isShow,
         b.operate_address as operateAddress
         FROM

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml

@@ -108,7 +108,9 @@
         ORDER BY t.applyTime DESC;
     </select>
     <select id="getDeviceByDept" resultType="java.util.Map">
-        SELECT sd.dept_abbreviation                AS companyName, -- 公司名称
+        SELECT
+            sd.dept_id                         AS companyId,
+            sd.dept_abbreviation                AS companyName, -- 公司名称
                -- 工具数量：无数据则为0，取整
                ROUND(IFNULL(SUM(temp.toolNum), 0)) AS toolNum,
                -- 设备数量：无数据则为0，取整