From d039b89816988e6bed65ac7e5892d12df3e5e604 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 六月 2024 14:12:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
index 913d390..76d5f81 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
@@ -1210,7 +1210,7 @@
* @return 浼氳瘽瀵硅薄
*/
public static SessionInfo getCurrentUserSessionInfoNotException() {
- return WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
+ return WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
}
/**
@@ -1218,7 +1218,7 @@
* @param sessionInfo 鐢ㄦ埛瀵硅薄
*/
public static void setCurrentUserSessionInfo(SessionInfo sessionInfo){
- WebThreadLocalUtil.getCurrentUserSessionInfoInThread().set(sessionInfo);
+ WebThreadLocalUtil.setCurrentUserSessionInfoInThread(sessionInfo);
}
/**
@@ -1226,7 +1226,7 @@
* @return true琛ㄧず鏌ヨ
*/
public static boolean isQueryTotal(){
- String needQueryTotal = WebThreadLocalUtil.getNeedQueryTotalInThread().get();
+ String needQueryTotal = WebThreadLocalUtil.getNeedQueryTotalInThread();
if("false".equalsIgnoreCase(needQueryTotal)){
return false;
}else{
@@ -1929,4 +1929,15 @@
}
return new String(c);
}
+
+ /**
+ * 灏唖tring闆嗗悎杞负stirng鏁扮粍
+ * @param strCollection string闆嗗悎
+ * @return string鏁扮粍
+ */
+ public static String[] collection2StrArr(Collection<String> strCollection){
+ String[] strArr = new String[strCollection.size()];
+ strCollection.toArray(strArr);
+ return strArr;
+ }
}
--
Gitblit v1.9.3