diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs
index 58e2f0dc..6911bff9 100644
--- a/SGGL/BLL/DropListService.cs
+++ b/SGGL/BLL/DropListService.cs
@@ -138,8 +138,8 @@
public static ListItem[] IsPostDropList()
{
ListItem[] lis = new ListItem[2];
- lis[0] = new ListItem("在岗", BLL.Const._True);
- lis[1] = new ListItem("离岗", BLL.Const._False);
+ lis[0] = new ListItem("在职", BLL.Const._True);
+ lis[1] = new ListItem("离职", BLL.Const._False);
return lis;
}
#endregion
diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs
index d042a35c..5d1e45ca 100644
--- a/SGGL/BLL/Person/Person_PersonsService.cs
+++ b/SGGL/BLL/Person/Person_PersonsService.cs
@@ -112,9 +112,9 @@ namespace BLL
x.RoleIds,
RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
x.CurrentProjectId,
- CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName,
+ CurrentProjectName = getCurrentProjectName(x.PersonId),
x.CurrentProjectWorkPostId,
- CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
+ CurrentProjectWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
IsPost = x.IsPost ?? true,
x.SignatureUrl,
x.Address,
@@ -139,7 +139,47 @@ namespace BLL
};
}
#endregion
-
+
+ #region 获取当前项目及岗位
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string getCurrentProjectName(string PersonId)
+ {
+ var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+ if (getItem != null)
+ {
+ return ProjectService.GetShortNameByProjectId(getItem.ProjectId);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string getCurrentProjectWorkPostName( string PersonId)
+ {
+ var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+ if (getItem != null)
+ {
+ return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ #endregion
+
#region 根据主键获取人员信息
///
/// 根据主键获取人员信息
diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
index 2cd9fee5..426a1ffa 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
+++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
@@ -95,9 +95,9 @@
-
+
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
index 1dfbca62..2df3936c 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
+++ b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
@@ -50,7 +50,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index df1a876c..ac41d93a 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -786,6 +786,30 @@ namespace FineUIPro.Web
}
#endregion
+ #region 获取是否字面值,在 ASPX 中调用
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected string GetIsPost(object bitValue)
+ {
+ string value = string.Empty;
+ if (bitValue != null)
+ {
+ if (bitValue.ToString() == "1" || Convert.ToBoolean(bitValue.ToString()))
+ {
+ value = "在职";
+ }
+ else
+ {
+ value = "离职";
+ }
+ }
+ return value;
+ }
+ #endregion
+
#region 获取项目状态的字面值,在 ASPX 中调用
///
/// 获取项目状态的字面值,在 ASPX 中调用