diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
index 9bd3684..03f889a 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
@@ -228,7 +228,6 @@ public class DevInfo extends BaseEntity {
     private String city;
 
     @ApiModelProperty(value = "公司Id")
-    @NotBlank(message = "所属公司不能为空")
     private String companyId;
 
     @ApiModelProperty(value = "管理方式(0编号 1计数)")
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index f02424c..ea9941a 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -313,6 +313,7 @@ public class DevInfoServiceImpl implements DevInfoService {
             code = getString();
         }
         devInfo.setCode(code);
+        devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString());
         int saveSuccessNum = devInfoMapper.insertDevInfo(devInfo);
         if (saveSuccessNum == 0) {
             return AjaxResult.error("设备信息SQL保存失败，请修改后重试");
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 e0cad84..dbcbd67 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
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsDayPrice != null and jsDayPrice != ''">js_day_price,</if>
             <if test="description != null and description != ''">`description`,</if>
             <if test="gpsCode != null and gpsCode != ''">gps_code,</if>
-            <if test="companyId != null">own_co,</if>
+            <if test="companyId != null and companyId != ''" >own_co,</if>
             <if test="person != null and person != ''">person,</if>
             <if test="personPhone != null and personPhone != ''">person_phone,</if>
             create_time,
@@ -319,7 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsDayPrice != null  and jsDayPrice != ''">#{jsDayPrice},</if>
             <if test="description != null   and description != ''">#{description},</if>
             <if test="gpsCode != null    and gpsCode != ''">#{gpsCode},</if>
-            <if test="companyId != null">#{companyId},</if>
+            <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="person != null and person != ''">#{person},</if>
             <if test="personPhone != null and personPhone != ''">#{personPhone},</if>
             now(),