Merge pull request #2403 from int2001/lba_eqsl_fix

Fixed EQSL-Col naming
这个提交包含在:
Andreas Kristiansen 2023-08-14 07:49:34 +02:00 提交者 GitHub
当前提交 55748abcf9
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23

查看文件

@ -86,19 +86,19 @@ class Logbookadvanced_model extends CI_Model {
} }
if ($searchCriteria['eqslSent'] !== '') { if ($searchCriteria['eqslSent'] !== '') {
$condition = "COL_EQSL_SENT = ?"; $condition = "COL_EQSL_QSL_SENT = ?";
if ($searchCriteria['eqslSent'] == 'N') { if ($searchCriteria['eqslSent'] == 'N') {
$condition = '('.$condition; $condition = '('.$condition;
$condition .= " OR COL_EQSL_SENT IS NULL OR COL_EQSL_SENT = '')"; $condition .= " OR COL_EQSL_QSL_SENT IS NULL OR COL_EQSL_QSL_SENT = '')";
} }
$conditions[] = $condition; $conditions[] = $condition;
$binding[] = $searchCriteria['eqslSent']; $binding[] = $searchCriteria['eqslSent'];
} }
if ($searchCriteria['eqslReceived'] !== '') { if ($searchCriteria['eqslReceived'] !== '') {
$condition = "COL_EQSL_RCVD = ?"; $condition = "COL_EQSL_QSL_RCVD = ?";
if ($searchCriteria['eqslReceived'] == 'N') { if ($searchCriteria['eqslReceived'] == 'N') {
$condition = '('.$condition; $condition = '('.$condition;
$condition .= " OR COL_EQSL_RCVD IS NULL OR COL_EQSL_RCVD = '')"; $condition .= " OR COL_EQSL_QSL_RCVD IS NULL OR COL_EQSL_QSL_RCVD = '')";
} }
$conditions[] = $condition; $conditions[] = $condition;
$binding[] = $searchCriteria['eqslReceived']; $binding[] = $searchCriteria['eqslReceived'];