新增webcad生产单导入：1、cadtoken请求网关异常修复；2、cad拆单批量数据组织id缺省补充；

cf-gateway/src/main/java/com/cf/imes/gateway/filter/logging/AccessLogFilter.java

@@ -214,7 +214,6 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
                             gatewayLog.getEndTime()).toMillis()));
                     // 设置其它字段
                     gatewayLog.setUserId(SecurityFrameworkUtils.getLoginUserId(exchange));
-                    gatewayLog.setUserType(SecurityFrameworkUtils.getLoginUserType(exchange));
                     gatewayLog.setResponseHeaders(response.getHeaders());
                     gatewayLog.setHttpStatus(response.getStatusCode());
 

cf-gateway/src/main/java/com/cf/imes/gateway/util/SecurityFrameworkUtils.java

@@ -1,6 +1,7 @@
 package com.cf.imes.gateway.util;
 
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.gateway.filter.security.LoginUser;
 import lombok.SneakyThrows;
@@ -60,8 +61,10 @@ public class SecurityFrameworkUtils {
      * @param user 用户
      */
     public static void setLoginUser(ServerWebExchange exchange, LoginUser user) {
-        exchange.getAttributes().put(LOGIN_USER_ID_ATTR, user.getId());
+        Long userId = user.getId();
-        exchange.getAttributes().put(LOGIN_USER_TYPE_ATTR, user.getUserType());
+        if (ObjectUtil.isNotNull(userId)) {
+            exchange.getAttributes().put(LOGIN_USER_ID_ATTR, userId);
+        }
     }
 
     /**

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java

@@ -256,6 +256,7 @@ public class WebCadOrderImportFactory {
                     .brand(plateGoodDO.getBrand())
                     .price(0.00)
                     .deleted(false)
+                    .organId(organId)
                     .build();
             Long orderGoodsId = (Long) snowFlakeGenerator.nextId(null);
 
@@ -279,6 +280,7 @@ public class WebCadOrderImportFactory {
                     .planId(0L)
                     .price(0.00)
                     .deleted(false)
+                    .organId(organId)
                     .build();
 
             goodsDOS.add(goodsDO);
@@ -641,6 +643,7 @@ public class WebCadOrderImportFactory {
                         .packageId(0L)
                         .partsId(0L)
                         .num(1.0)
+                        .organId(organId)
                         .build();
                 orderItemDOS.add(orderItemDO);
             }
@@ -658,6 +661,7 @@ public class WebCadOrderImportFactory {
                     .packageId(0L)
                     .partsId(0L)
                     .num(1.0)
+                    .organId(organId)
                     .build();
             orderItemDOS.add(orderItemDO);
         }
@@ -789,6 +793,7 @@ public class WebCadOrderImportFactory {
                         .packageId(0L)
                         .plateId(0L)
                         .num(part.getNum())
+                        .organId(organId)
                         .build();
                 orderItemDOS.add(orderItemDO);
             }
@@ -804,6 +809,7 @@ public class WebCadOrderImportFactory {
                     .packageId(0L)
                     .plateId(0L)
                     .num(partNum)
+                    .organId(organId)
                     .build();
             orderItemDOS.add(orderItemDO);
         } else {
@@ -819,6 +825,7 @@ public class WebCadOrderImportFactory {
                     .packageId(0L)
                     .plateId(0L)
                     .num(part.getNum())
+                    .organId(organId)
                     .build();
             orderItemDOS.add(orderItemDO);
         }