|
@@ -120,7 +120,7 @@ class report {
|
|
|
|
|
|
|
|
//Group Name 判断
|
|
//Group Name 判断
|
|
|
$company = _getCompanyHandNew($_SESSION["ONLINE_USER"],'public');
|
|
$company = _getCompanyHandNew($_SESSION["ONLINE_USER"],'public');
|
|
|
- $company = strtolower($company);
|
|
|
|
|
|
|
+ //$company = strtolower($company);
|
|
|
$aa = explode(";", $company);
|
|
$aa = explode(";", $company);
|
|
|
|
|
|
|
|
$escaped_company = array();
|
|
$escaped_company = array();
|
|
@@ -134,7 +134,7 @@ class report {
|
|
|
$escaped_company[] = "'" . common::check_input('default_value_that_does_not_exist') . "'";
|
|
$escaped_company[] = "'" . common::check_input('default_value_that_does_not_exist') . "'";
|
|
|
}
|
|
}
|
|
|
$array_str = 'ARRAY[' . implode(',', $escaped_company) . ']';
|
|
$array_str = 'ARRAY[' . implode(',', $escaped_company) . ']';
|
|
|
- $sqlWhere_group_name = " OR lower(group_names) && $array_str";
|
|
|
|
|
|
|
+ $sqlWhere_group_name = " OR group_names && $array_str";
|
|
|
|
|
|
|
|
$systemAccountsqlWhere = " OR '".common::check_input(_getLoginName())."' = any(system_account)";
|
|
$systemAccountsqlWhere = " OR '".common::check_input(_getLoginName())."' = any(system_account)";
|
|
|
$sqlWhere .= " and ( access_type = 'All Users' ".$sqlWhere_party_id . " ".$sqlWhere_group_name ." ".$systemAccountsqlWhere .")";
|
|
$sqlWhere .= " and ( access_type = 'All Users' ".$sqlWhere_party_id . " ".$sqlWhere_group_name ." ".$systemAccountsqlWhere .")";
|
|
@@ -416,7 +416,7 @@ class report {
|
|
|
|
|
|
|
|
//Group Name 判断
|
|
//Group Name 判断
|
|
|
$company = _getCompanyHandNew($_SESSION["ONLINE_USER"],'public');
|
|
$company = _getCompanyHandNew($_SESSION["ONLINE_USER"],'public');
|
|
|
- $company = strtolower($company);
|
|
|
|
|
|
|
+ //$company = strtolower($company);
|
|
|
$aa = explode(";", $company);
|
|
$aa = explode(";", $company);
|
|
|
|
|
|
|
|
$escaped_company = array();
|
|
$escaped_company = array();
|
|
@@ -430,7 +430,7 @@ class report {
|
|
|
$escaped_company[] = "'" . common::check_input('default_value_that_does_not_exist') . "'";
|
|
$escaped_company[] = "'" . common::check_input('default_value_that_does_not_exist') . "'";
|
|
|
}
|
|
}
|
|
|
$array_str = 'ARRAY[' . implode(',', $escaped_company) . ']';
|
|
$array_str = 'ARRAY[' . implode(',', $escaped_company) . ']';
|
|
|
- $sqlWhere_group_name = " OR lower(group_names) && $array_str";
|
|
|
|
|
|
|
+ $sqlWhere_group_name = " OR group_names && $array_str";
|
|
|
|
|
|
|
|
$systemAccountsqlWhere = " OR '".common::check_input(_getLoginName())."' = any(system_account)";
|
|
$systemAccountsqlWhere = " OR '".common::check_input(_getLoginName())."' = any(system_account)";
|
|
|
$sqlWhere .= " and ( access_type = 'All Users' ".$sqlWhere_party_id . " ".$sqlWhere_group_name ." ".$systemAccountsqlWhere .")";
|
|
$sqlWhere .= " and ( access_type = 'All Users' ".$sqlWhere_party_id . " ".$sqlWhere_group_name ." ".$systemAccountsqlWhere .")";
|
