Merge remote-tracking branch 'origin/master'

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -93,11 +93,11 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         wrapper.like("pi", ProductInfo::getBarCode, dto.getBarCode());
         wrapper.like("json_unquote(standard_json->'$.englishName')", dto.getEnglishName());
         wrapper.like("json_unquote(standard_json->'$.customsCode')", dto.getCustomsCode());
-        //        wrapper.keyword(dto,
-        //                new SqlField("pi", ProductInfo::getName),
-        //                new SqlField("pi", ProductInfo::getCode),
-        //                new SqlField("pi", ProductInfo::getCustomCode)
-//        );
+        wrapper.keyword(dto,
+                new SqlField("pi", ProductInfo::getName),
+                new SqlField("pi", ProductInfo::getCode),
+                new SqlField("pi", ProductInfo::getCustomCode)
+        );
         //计算并根据生命周期过滤
         wrapper.eq("IF(DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 ))", dto.getLifeCycle());
         wrapper.eq("json_unquote( victoriatourist_json -> '$.combination' )", dto.getCombination());

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionProcessesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +18,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -51,8 +54,11 @@ public class ProductionProcessesServiceImpl extends ServiceImpl<ProductionProces
     @DSTransactional
     @Override
     public void add(ProductionProcessesDto productionProcessesDto) {
-        ObsFile obsFile = productionProcessesDto.getFileList().get(0);
-        productionProcessesDto.setFileName(obsFile.getFileName());
+        List<ObsFile> fileList = productionProcessesDto.getFileList();
+        if(ObjectUtil.isNotEmpty(fileList)){
+            ObsFile obsFile = productionProcessesDto.getFileList().get(0);
+            productionProcessesDto.setFileName(obsFile.getFileName());
+        }
         this.save(productionProcessesDto);
         ObsFileUtil.saveFile(productionProcessesDto.getFileList(), productionProcessesDto.getId());
     }