From 4339b24829d444fbad192a42256c9c3c5f5f0779 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 23 Sep 2024 09:03:11 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-23=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/service/impl/BomManagementServiceImpl.java   | 1 +
 .../part/service/impl/RoutingManagementServiceImpl.java       | 1 +
 .../modules/sys/service/impl/SysUserTokenServiceImpl.java     | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
index b36c1e11..cff0457e 100644
--- a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
@@ -965,6 +965,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             detailEntity.setBomType(data.getBomType());
             detailEntity.setEngChgLevel(data.getEngChgLevel());
             detailEntity.setOfficialFlag("N");
+            detailEntity.setStatus("Tentative");
             bomManagementMapper.bomDetailSave(detailEntity);
             // 创建bomComponent
             if (!componentDataList.isEmpty()) {
diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
index 92394d4c..3fdc8c22 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -1016,6 +1016,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
             detailEntity.setRoutingType(data.getRoutingType());
             detailEntity.setRoutingRevision(data.getRoutingRevision());
             detailEntity.setOfficialFlag("N");
+            detailEntity.setStatus("Tentative");
             routingManagementMapper.routingDetailSave(detailEntity);
             // 创建routingComponent
             if (!componentDataList.isEmpty()) {
diff --git a/src/main/java/com/spring/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/spring/modules/sys/service/impl/SysUserTokenServiceImpl.java
index ab98cb7e..1cab98a7 100644
--- a/src/main/java/com/spring/modules/sys/service/impl/SysUserTokenServiceImpl.java
+++ b/src/main/java/com/spring/modules/sys/service/impl/SysUserTokenServiceImpl.java
@@ -11,6 +11,7 @@ import com.spring.modules.sys.entity.SysUserTokenEntity;
 import com.spring.modules.sys.form.SysLoginForm;
 import com.spring.modules.sys.oauth2.TokenGenerator;
 import com.spring.modules.sys.service.SysUserTokenService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -109,6 +110,7 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
 			tokenEntity.setExpireTime(expireTime);
 			this.updateById(tokenEntity);
 		}
-		return R.ok().put("token", tokenEntity.getToken()).put("expire", EXPIRE).put("language", userList.get(0).getLanguageDefault()).put("userName", userList.get(0).getUsername());
+		String site = StringUtils.isNoneBlank(form.getSite()) ? form.getSite() : userList.get(0).getSite();
+		return R.ok().put("token", tokenEntity.getToken()).put("expire", EXPIRE).put("language", userList.get(0).getLanguageDefault()).put("userName", userList.get(0).getUsername()).put("site", site);
 	}
 }