From a3e30d1fa2792066bc3adc03b5572b2979654d80 Mon Sep 17 00:00:00 2001
From: cn <c771420507@foxmail.com>
Date: Fri, 12 Aug 2022 11:04:09 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=8B=9B=E6=8A=95?=
 =?UTF-8?q?=E6=A0=87=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/auth/domain/TerminalInfo.java   | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
index 7c34761..96107ec 100644
--- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
+++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
@@ -1,5 +1,6 @@
 package cn.axzo.framework.auth.domain;
 
+import cn.hutool.core.collection.CollectionUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,8 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
-import cn.hutool.core.collection.CollectionUtil;
+import org.springframework.util.StringUtils;
 
 
 /**
@@ -269,13 +269,47 @@ public class TerminalInfo {
 	}
 
 	/**
-	 * 招采平台
+	 * 交易业务投标
 	 */
-	public static final String NT_BID_WEB_ENT_LEADER = "NT_BID_WEB_ENT_LEADER";
+	public static final String NT_BID_WEB_T = "NT_BID_WEB_T";
 	static {
-		aliasMap.put(NT_BID_WEB_ENT_LEADER, NT_BID_WEB_ENT_LEADER);
+		aliasMap.put(NT_BID_WEB_T, NT_BID_WEB_T);
 	}
 
+	/**
+	 * 交易业务招标
+	 */
+	public static final String NT_BID_WEB_Z = "NT_BID_WEB_Z";
+	static {
+		aliasMap.put(NT_BID_WEB_Z, NT_BID_WEB_Z);
+	}
+
+	/**
+	 * 是否是招投标
+	 * @return
+	 */
+	public boolean isBID_WEB() {
+		if (!StringUtils.hasText(newTerminalString)) {
+			return false;
+		}
+		return newTerminalString.startsWith("NT_BID_WEB_");
+	}
+
+	/**
+	 * 是否是投标
+	 * @return
+	 */
+	public boolean isBID_WEB_BID() {
+		return NT_BID_WEB_T.equals(newTerminalString);
+	}
+
+	/**
+	 * 是否是招标
+	 * @return
+	 */
+	public boolean isBID_WEB_TENDER() {
+		return NT_BID_WEB_Z.equals(newTerminalString);
+	}
 
 
 
@@ -352,13 +386,7 @@ public class TerminalInfo {
 		return newTerminalString;
 	}
 
-	/**
-	 * 是否是招采端
-	 * @return
-	 */
-	public boolean isBID_WEB() {
-		return NT_BID_WEB_ENT_LEADER.equals(newTerminalString);
-	}
+
 
 	public boolean isOMS_WEB() {
 		return NT_OMS_WEB.equals(newTerminalString);