diff --git a/gys_system/models/groupinfo_model.php b/gys_system/models/groupinfo_model.php index 243e9326..31dbe959 100644 --- a/gys_system/models/groupinfo_model.php +++ b/gys_system/models/groupinfo_model.php @@ -89,7 +89,7 @@ class Groupinfo_model extends CI_Model { empty($eoi_type) ? false : $sql.=' AND EOI_Type= ' . $this->HT->escape($eoi_type); empty($eoi_date) ? false : $sql.=' AND ' . $eoi_date; //查找没有添加反馈表的团 - ($eoi_fillworkers_sn !== null) ? false : $sql.=' AND EOI_FillWorkers_SN IS NULL AND EOI_VerifyUser_SN IS NULL '; + ($eoi_fillworkers_sn !== null) ? false : $sql.=' AND EOI_FillWorkers_SN IS NULL AND EOI_VerifyUser_SN IS NULL AND (select COUNT(*) from InfoManager.dbo.tga_feedback_evaluation where group_id=EOI_GRI_SN and travel_agency_id=EOI_VEI_SN )=0'; $sql.=' ORDER BY ' . $orderby; $query = $this->HT->query($sql); diff --git a/webht/third_party/dingmail/views/user.php b/webht/third_party/dingmail/views/user.php index 69792f03..4233fd93 100644 --- a/webht/third_party/dingmail/views/user.php +++ b/webht/third_party/dingmail/views/user.php @@ -130,7 +130,7 @@
钉邮签名没有更新成功的同学请看这里:
-拖动鼠标选中上方的三个按钮(在按钮下方鼠标左键三击试试),然后按下Ctrl+C键进行复制到自己的outlook签名里即可。
温馨提示:不能直接用鼠标右键功能进行复制
+拖动鼠标选中上方的三个按钮(在按钮下方鼠标左键三击试试),然后按下Ctrl+C键进行复制到自己的钉邮签名里即可。
温馨提示:不能直接用鼠标右键功能进行复制