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

gys_system/models/groupinfo_model.php

@@ -77,7 +77,7 @@ class Groupinfo_model extends CI_Model {
                     )        AS groupname
                 FROM             Eva_ObjectInfo
                 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 eoi_cancel = 0
@@ -85,6 +85,7 @@ class Groupinfo_model extends CI_Model {
 
                  ";
 
+                 // 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);