|
@@ -436,7 +436,7 @@ namespace SiteCore.Handler
|
|
|
if (dw_finish.Length > 0) lw.Add(dw_finish);
|
|
if (dw_finish.Length > 0) lw.Add(dw_finish);
|
|
|
|
|
|
|
|
string returnvstate = GetPostString("returnvstate");
|
|
string returnvstate = GetPostString("returnvstate");
|
|
|
- if (returnvstate.Length > 0) lw.Add(string.Format("audit_type={0}", Convert.ToInt32(returnvstate)));
|
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(returnvstate) && !"null".Equals(returnvstate)) lw.Add(string.Format("audit_type={0}", Convert.ToInt32(returnvstate)));
|
|
|
|
|
|
|
|
string persuadetype = GetPostString("persuadetype");
|
|
string persuadetype = GetPostString("persuadetype");
|
|
|
if (persuadetype.Length > 0) lw.Add(string.Format("stay_type like '%{0}%'", persuadetype));
|
|
if (persuadetype.Length > 0) lw.Add(string.Format("stay_type like '%{0}%'", persuadetype));
|
|
@@ -445,7 +445,7 @@ namespace SiteCore.Handler
|
|
|
{
|
|
{
|
|
|
lw.Add(string.Format("OrgID = {0}", customerOrg));
|
|
lw.Add(string.Format("OrgID = {0}", customerOrg));
|
|
|
}
|
|
}
|
|
|
- if (ceErpUser != null && ceErpUser.ManageOrgIds.Length > 0)
|
|
|
|
|
|
|
+ if (ceErpUser != null && !string.IsNullOrEmpty(ceErpUser.ManageOrgIds))
|
|
|
{
|
|
{
|
|
|
lw.Add(string.Format("OrgId in ({0}) ", ceErpUser.ManageOrgIds));
|
|
lw.Add(string.Format("OrgId in ({0}) ", ceErpUser.ManageOrgIds));
|
|
|
}
|
|
}
|