From ee945ee8d3199e91df76e7b320d2c37f5efc599a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 12 九月 2018 17:10:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 4fe6546..90ffe93 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -448,10 +448,21 @@
int type = 0;
if (jumpTask == 0)//璺冲埌榛樿閫変腑
{
- if (_list.Contains(taskmodel.GetNowTaskID))
+ if (taskmodel.GetNowTaskID != taskmodel.TaskupToDate)//榛樿鐨勫拰鏈�鏂伴�変腑鐨勪笉涓�鑷存椂
{
- type = _list.IndexOf(taskmodel.GetNowTaskID);
+ if (_list.Contains(taskmodel.TaskupToDate))
+ {
+ type = _list.IndexOf(taskmodel.TaskupToDate);
+ }
+ taskmodel.TaskupToDate = taskmodel.GetNowTaskID;
}
+ else
+ {
+ if (_list.Contains(taskmodel.GetNowTaskID))
+ {
+ type = _list.IndexOf(taskmodel.GetNowTaskID);
+ }
+ }
}
else
{
--
Gitblit v1.8.0