Merge branch 'master' of github.com:hainatravel/information-system into master

master
candice 4 weeks ago
commit 0d87c8d70b

@ -77,7 +77,7 @@ class Groupinfo_model extends CI_Model {
) AS groupname ) AS groupname
FROM Eva_ObjectInfo FROM Eva_ObjectInfo
WHERE 1=1 WHERE 1=1
AND EOI_sendEvaluation = 1 AND (EOI_sendEvaluation = 1 or EOI_sendEvaluation is null)
AND (select COUNT(*) from GRoupInfo where isnull(GRI_OrderType,227001)=227001 and GRI_SN=eoi_gri_sn)>0 AND (select COUNT(*) from GRoupInfo where isnull(GRI_OrderType,227001)=227001 and GRI_SN=eoi_gri_sn)>0
AND eoi_cancel = 0 AND eoi_cancel = 0
@ -85,7 +85,8 @@ class Groupinfo_model extends CI_Model {
"; ";
// AND (EOI_Type = 1 or EOI_Type = 3) //多城市反馈表为3了为了兼容还是去掉先以后只留3 20260313 // AND EOI_sendEvaluation = 1 //这个状态也不再汉特设置了
// AND (EOI_Type = 1 or EOI_Type = 3) //多城市反馈表为3了为了兼容还是去掉先以后只留3 20260313
empty($eoi_sn) ? false : $sql.=' AND EOI_SN= ' . $this->HT->escape($eoi_sn); empty($eoi_sn) ? false : $sql.=' AND EOI_SN= ' . $this->HT->escape($eoi_sn);
empty($gri_sn) ? false : $sql.=' AND EOI_GRI_SN= ' . $this->HT->escape($gri_sn); empty($gri_sn) ? false : $sql.=' AND EOI_GRI_SN= ' . $this->HT->escape($gri_sn);

Loading…
Cancel
Save