Skip to content

Commit bf9328f

Browse files
committed
整理到 代码控制 发布版。
2 parents 92f538d + 42ffb70 commit bf9328f

File tree

17 files changed

+47
-29
lines changed

17 files changed

+47
-29
lines changed

src/RoadFlow/Business.Platform/Organize.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public Organize()
1313
{
1414
this.dataOrganize = Data.Factory.Platform.GetOrganizeInstance();
1515
}
16+
17+
1618
/// <summary>
1719
/// 新增
1820
/// </summary>
@@ -198,7 +200,7 @@ public int GetMaxSort(Guid id)
198200
}
199201
}
200202
userList.RemoveAll(p => p == null);
201-
return userList;
203+
return userList.Distinct(new UsersEqualityComparer()).ToList();
202204
}
203205

204206
private void addWorkGroupUsers(List<Data.Model.Users> userList, Data.Model.WorkGroup wg)

src/RoadFlow/Business.Platform/Users.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,4 +439,16 @@ public string GetChargeLeader(Guid userID)
439439
return "";
440440
}
441441
}
442+
443+
public class UsersEqualityComparer : IEqualityComparer<Data.Model.Users>
444+
{
445+
public bool Equals(Data.Model.Users user1, Data.Model.Users user2)
446+
{
447+
return user1.ID == user2.ID;
448+
}
449+
public int GetHashCode(Data.Model.Users user)
450+
{
451+
return user.ToString().GetHashCode();
452+
}
453+
}
442454
}

src/RoadFlow/WebMvc/Content/Controls/Files/delete.ashx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public class Delete : IHttpHandler, IReadOnlySessionState
1515

1616
string str1 = context.Request["str1"];
1717
string str2 = context.Request["str2"];
18-
if (!Check.CheckLogin(false))
18+
string msg;
19+
if (!WebMvc.Common.Tools.CheckLogin(out msg))
1920
{
2021
context.Response.Write("var json = {\"success\":0,\"message\":\"您不能删除文件\"}");
2122
context.Response.End();

src/RoadFlow/WebMvc/Content/Controls/Files/upload.ashx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class Upload : IHttpHandler, IReadOnlySessionState
1212
context.Response.ContentType = "text/plain";
1313
string str1 = context.Request["str1"];
1414
string str2 = context.Request["str2"];
15-
if (!Check.CheckLogin(false))
15+
string msg;
16+
if (!WebMvc.Common.Tools.CheckLogin(out msg))
1617
{
1718
context.Response.Write("您不能上传文件");
1819
context.Response.End();
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)