+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 42ba0249b..4e18edd7e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
@@ -172,6 +172,7 @@ var bootstrap = function ($, learun) {
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);
+ console.log(2);
}
else {
$('[data-table="' + id + '"]').lrSetFormData(data[id]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
index 845b91aa1..1cbc41857 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
@@ -460,7 +460,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
-
+ { label: "排序", name: "F_Order", width: 100, align: "left" },
{
label: "最高学历", name: "HighestRecord", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -615,6 +615,7 @@ var bootstrap = function ($, learun) {
],
mainId: 'EmpId',
+ sidx: 'F_Order asc',
isPage: true,
isMultiselect: true
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
index 5067e8d74..2488e7e83 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
@@ -357,6 +357,7 @@ var bootstrap = function ($, learun) {
}
}
},
+ { label: "排序", name: "F_Order", index: "F_Order", width: 50, align: "center"},
{
label: "最后登录时间", name: "F_UserId_Log", width: 200, align: "left", formatterAsync: function (callback, value, row) {
learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetLastLoginTime?userId=' + value, function (res) {
@@ -372,6 +373,7 @@ var bootstrap = function ($, learun) {
isPage: true,
reloadSelected: true,
mainId: 'F_UserId',
+ sidx: 'F_Order asc',
isMultiselect: true
});
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
index ed9380366..4aaae7b41 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
@@ -527,7 +527,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("WORKERTECHNOLOGYSTATUS")]
public bool? WorkerTechnologyStatus { get; set; }
-
+
///
/// 任同职级职务时间
///
@@ -585,6 +585,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("ISINACTIVETIME")]
public DateTime? IsInActiveTime { get; set; }
+ ///
+ /// 排序
+ ///
+ [Column("F_ORDER")]
+ public int? F_Order { get; set; }
+
+
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index b03e465b3..924390e69 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
@@ -434,6 +434,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
userbase.F_CompanyId = tEntity.F_CompanyId;
userbase.F_DepartmentId = tEntity.F_DepartmentId;
userbase.F_IdentityCardNo = tEntity.IdentityCardNo;
+ userbase.F_Order = tEntity.F_Order;
userIBLL.SaveEntity(null, userbase);
studentList.Add(userbase);
}
@@ -545,7 +546,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
var keyValueArr = keyValue.Split(',');
foreach (var item in keyValueArr)
{
- db.ExecuteBySql("update EmpInfo set CheckMark=1 where EmpId='" + item + "'");
+ db.ExecuteBySql("update EmpInfo set CheckMark=1 where EmpId='" + item + "'");
}
db.Commit();
}