diff --git a/SGGL/BLL/Person/Person_ShuntService.cs b/SGGL/BLL/Person/Person_ShuntService.cs index e3ce4ba4..f4b0ab8f 100644 --- a/SGGL/BLL/Person/Person_ShuntService.cs +++ b/SGGL/BLL/Person/Person_ShuntService.cs @@ -80,15 +80,16 @@ namespace BLL x.DepartId, x.WorkPostId, WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId), + x.Major, x.PostTitleId, PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId), x.IsOffice, x.RoleIds, RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds), x.CurrentProjectId, - CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName, + LastProjectName = getCurrentProjectName(x.PersonId), x.CurrentProjectWorkPostId, - CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId), + LastWorkPostName = getCurrentProjectWorkPostName(x.PersonId), IsPost = x.IsPost ?? true, IsPostName = x.IsPost == false ? "否" : "是", x.SignatureUrl, @@ -97,6 +98,51 @@ namespace BLL } #endregion + #region 获取当前项目及岗位 + /// + /// + /// + /// + /// + /// + public static string getCurrentProjectName(string PersonId) + { + var getItem = (from x in Funs.DB.SitePerson_PersonItem where x.PersonId == PersonId + orderby x.InTime descending + select x).FirstOrDefault(); + if (getItem != null) + { + return ProjectService.GetShortNameByProjectId(getItem.ProjectId); + } + else + { + return null; + } + } + + /// + /// + /// + /// + /// + /// + public static string getCurrentProjectWorkPostName(string PersonId) + { + var getItem = (from x in Funs.DB.SitePerson_PersonItem + where x.PersonId == PersonId + orderby x.InTime descending + select x).FirstOrDefault(); + if (getItem != null) + { + return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId); + } + else + { + return null; + } + } + #endregion + /// /// 添加分流管理 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 16730b00..33e1c816 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -12228,9 +12228,8 @@ True True 0 - - - http://localhost:8008/ + / + http://localhost:14901/ False False diff --git a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx index 0e97f48b..c3de4103 100644 --- a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx +++ b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx @@ -71,6 +71,9 @@ + + @@ -86,12 +89,15 @@ - <%-- + - - --%> + + + <%--