From 99b32fceb6bf33640ba7e49bcc8f2eabfe3bd605 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 6 Aug 2019 16:22:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9value=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/dingmail/views/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
 				</div>
 				<div class="clearfix">
 					<p>钉邮签名没有更新成功的同学请看这里：</p>
-					<p>拖动鼠标选中上方的三个按钮(在<span class="text-danger">按钮下方</span>鼠标左键三击试试)，然后按下Ctrl+C键进行复制到自己的outlook签名里即可。</p><p>温馨提示：不能直接用鼠标右键功能进行复制</p>
+					<p>拖动鼠标选中上方的三个按钮(在<span class="text-danger">按钮下方</span>鼠标左键三击试试)，然后按下Ctrl+C键进行复制到自己的钉邮签名里即可。</p><p>温馨提示：不能直接用鼠标右键功能进行复制</p>
 				</div>
 			  </div>
 			</div>

From c542ca6b3c931feca84685e9aa188c758187d284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Tue, 6 Aug 2019 17:31:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E5=8A=A9=E6=89=8B=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gys_system/models/groupinfo_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);