|
@@ -770,6 +770,15 @@ namespace OASystem.API.Controllers
|
|
string visaClients = item.VisaClient;
|
|
string visaClients = item.VisaClient;
|
|
if (!string.IsNullOrEmpty(visaClients))
|
|
if (!string.IsNullOrEmpty(visaClients))
|
|
{
|
|
{
|
|
|
|
+ System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
|
|
|
|
+ System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
|
|
|
|
+
|
|
|
|
+ if (m_EnName.Success || m_ZHName.Success)
|
|
|
|
+ {
|
|
|
|
+ itemClientName = visaClients;
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
string[] clientIds = new string[] { };
|
|
string[] clientIds = new string[] { };
|
|
if (visaClients.Contains(','))
|
|
if (visaClients.Contains(','))
|
|
{
|
|
{
|
|
@@ -948,6 +957,14 @@ namespace OASystem.API.Controllers
|
|
string insClients = item.ClientName;
|
|
string insClients = item.ClientName;
|
|
if (!string.IsNullOrEmpty(insClients))
|
|
if (!string.IsNullOrEmpty(insClients))
|
|
{
|
|
{
|
|
|
|
+ System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
|
|
|
|
+ System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
|
|
|
|
+
|
|
|
|
+ if (m_EnName.Success || m_ZHName.Success)
|
|
|
|
+ {
|
|
|
|
+ itemClientName = insClients;
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
|
|
string[] clientIds = new string[] { };
|
|
string[] clientIds = new string[] { };
|
|
if (insClients.Contains(','))
|
|
if (insClients.Contains(','))
|