lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs
+2 -2
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where p.RoleId.Contains(Const.ZBCNEngineer)
select new { UserId = x.UserId, UserName = x.UserName };
drpAudit.DataValueField = "UserId";
@@ -52,7 +52,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
drpRes.DataBind();
Funs.FineUIPleaseSelect(drpRes);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Funs.FineUIPleaseSelect(drpTeamGroupId);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Funs.FineUIPleaseSelect(drpTeamGroupId);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs
+1 -1
View File
@@ -104,7 +104,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
strSql += " AND testApplication.ExamDate <= @endDate";
listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim()));
}
if (this.CurrUser.UnitId != BLL.Const.UnitId_TCC)
if (this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ)
{
var user = BLL.ProjectUserService.GetCurrProjectUserByUserId(this.CurrUser.UserId);
if (user != null)