修改视频添加导入设备可为空

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/VideoController.java

@@ -26,6 +26,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -68,7 +69,7 @@ public class VideoController extends AbstractBaseController {
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public Video saveVideo(@RequestBody VideoSaveDto video) {
         Video video1 = video.getVideo();
-
+        ReginParams usrinfo = getSelectedOrgInfo();
         if (StringUtils.isNotEmpty(video1.getAddress())) {
             String[] addressData = video1.getAddress().split("@address@");
             if (addressData.length > 1) {
@@ -80,6 +81,10 @@ public class VideoController extends AbstractBaseController {
                 if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) {
                     video1.setLatitude(Double.valueOf(langLatObj.getString("latitude")));
                 }
+                video1.setOrgCode(usrinfo.getCompany().getOrgCode());
+                video1.setCreatorId(usrinfo.getUserModel().getSequenceNbr());
+                video1.setCreatorName(usrinfo.getUserModel().getRealName());
+                video1.setCompanyName(usrinfo.getCompany().getCompanyName());
                 video.setVideo(video1);
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -404,7 +404,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             // 数据校验
             if (ValidationUtil.isEmpty(x.getName()) || ValidationUtil.isEmpty(x.getCode())
                     || ValidationUtil.isEmpty(x.getUrl()) || ValidationUtil.isEmpty(x.getToken())
-                    || ValidationUtil.isEmpty(x.getAddress()) || ValidationUtil.isEmpty(x.getEquipmentSpecificCodes())) {
+                    || ValidationUtil.isEmpty(x.getAddress())) {
                 throw new RuntimeException("错误行" + rowNum + "：请检查非空字段");
             }
             if (videoCodeSet.contains(x.getCode().trim())) {