From d6c57e633aa00c4ec4995480b4e70508b60f50cd Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 4 Dec 2024 09:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=89=80=E5=B1=9E=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/material/device/domain/DevInfo.java   | 1 -
 .../material/device/service/impl/DevInfoServiceImpl.java      | 1 +
 .../main/resources/mapper/material/device/DevInfoMapper.xml   | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

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(),