From 526738058e84be272147530ad77c97a00c909d74 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 10 Mar 2025 14:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9A1=E3=80=81cadtoken=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=BD=91=E5=85=B3=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81cad=E6=8B=86=E5=8D=95=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=84=E7=BB=87id=E7=BC=BA=E7=9C=81?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cf/imes/gateway/filter/logging/AccessLogFilter.java    | 1 -
 .../com/cf/imes/gateway/util/SecurityFrameworkUtils.java   | 7 +++++--
 .../orderImport/factory/WebCadOrderImportFactory.java      | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cf-gateway/src/main/java/com/cf/imes/gateway/filter/logging/AccessLogFilter.java b/cf-gateway/src/main/java/com/cf/imes/gateway/filter/logging/AccessLogFilter.java
index ea852ebbe..a22a181b3 100644
--- a/cf-gateway/src/main/java/com/cf/imes/gateway/filter/logging/AccessLogFilter.java
+++ b/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());
 
diff --git a/cf-gateway/src/main/java/com/cf/imes/gateway/util/SecurityFrameworkUtils.java b/cf-gateway/src/main/java/com/cf/imes/gateway/util/SecurityFrameworkUtils.java
index 897c0a4c6..8d6eeb5ae 100644
--- a/cf-gateway/src/main/java/com/cf/imes/gateway/util/SecurityFrameworkUtils.java
+++ b/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());
-        exchange.getAttributes().put(LOGIN_USER_TYPE_ATTR, user.getUserType());
+        Long userId = user.getId();
+        if (ObjectUtil.isNotNull(userId)) {
+            exchange.getAttributes().put(LOGIN_USER_ID_ATTR, userId);
+        }
     }
 
     /**
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index 9a6e63029..8f924450b 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/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);
         }