diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js
index 47f0558aa..ae43a37f5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js
@@ -103,6 +103,7 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "资产名称", name: "aiassname", width: 100, align: "left"},
{
label: "使用者", name: "UserID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs
index 14938f04d..a39e1d427 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs
@@ -131,7 +131,8 @@ namespace Learun.Application.Base.SystemModule
/// 主键
/// 编码
///
- public bool ExistItemCode(string keyValue, string itemCode) {
+ public bool ExistItemCode(string keyValue, string itemCode)
+ {
try
{
bool res = false;
@@ -199,7 +200,8 @@ namespace Learun.Application.Base.SystemModule
///
/// 主键
/// 实体
- public void SaveClassifyEntity(string keyValue, DataItemEntity entity) {
+ public void SaveClassifyEntity(string keyValue, DataItemEntity entity)
+ {
try
{
dataItemService.SaveClassifyEntity(keyValue, entity);
@@ -279,7 +281,7 @@ namespace Learun.Application.Base.SystemModule
try
{
List list = cache.Read>(cacheKeyDetail + itemCode, CacheId.dataItem);
- if (list?.Count==0 || list==null)
+ if (list?.Count == 0 || list == null)
{
list = (List)dataItemService.GetDetailList(itemCode);
cache.Write>(cacheKeyDetail + itemCode, list, CacheId.dataItem);
@@ -303,26 +305,34 @@ namespace Learun.Application.Base.SystemModule
/// 获取数据字典详细映射数据
///
///
- public Dictionary> GetModelMap()
+ public Dictionary> GetModelMap()
{
try
{
- Dictionary> dic = cache.Read>>(cacheKeyDetail + "dic", CacheId.dataItem);
- if (dic == null) {
- dic = new Dictionary>();
+ Dictionary> dic = cache.Read>>(cacheKeyDetail + "dic", CacheId.dataItem);
+ if (dic == null)
+ {
+ dic = new Dictionary>();
var list = GetClassifyList();
- foreach (var item in list) {
+ foreach (var item in list)
+ {
var detailList = GetDetailList(item.F_ItemCode);
- if (!dic.ContainsKey(item.F_ItemCode)) {
- dic.Add(item.F_ItemCode,new Dictionary());
+ if (!dic.ContainsKey(item.F_ItemCode))
+ {
+ dic.Add(item.F_ItemCode, new Dictionary());
}
- foreach (var detailItem in detailList) {
- dic[item.F_ItemCode].Add(detailItem.F_ItemDetailId, new DataItemModel()
+ foreach (var detailItem in detailList)
+ {
+ if (!dic[item.F_ItemCode].ContainsKey(detailItem.F_ItemDetailId))
{
- parentId = detailItem.F_ParentId,
- text = detailItem.F_ItemName,
- value = detailItem.F_ItemValue
- });
+ dic[item.F_ItemCode].Add(detailItem.F_ItemDetailId, new DataItemModel()
+ {
+ parentId = detailItem.F_ParentId,
+ text = detailItem.F_ItemName,
+ value = detailItem.F_ItemValue
+ });
+ }
+
}
}
cache.Write(cacheKeyDetail + "dic", dic, CacheId.dataItem);
@@ -354,7 +364,8 @@ namespace Learun.Application.Base.SystemModule
try
{
List list = GetDetailList(itemCode);
- if (!string.IsNullOrEmpty(keyword)) {
+ if (!string.IsNullOrEmpty(keyword))
+ {
list = list.FindAll(t => t.F_ItemName.Contains(keyword) || t.F_ItemValue.Contains(keyword));
}
return list;
@@ -416,7 +427,8 @@ namespace Learun.Application.Base.SystemModule
{
List list = GetDetailList(itemCode);
List treeList = new List();
- foreach (var item in list) {
+ foreach (var item in list)
+ {
TreeModel node = new TreeModel();
node.id = item.F_ItemDetailId;
node.text = item.F_ItemName;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoEntity.cs
index 3d1f6b972..97630adde 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoEntity.cs
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
/// 日 期:2019-11-14 14:29
/// 描 述:使用人员变动记录
///
- public class Ass_UserChangeInfoEntity
+ public class Ass_UserChangeInfoEntity
{
#region 实体成员
///
@@ -59,6 +59,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
}
#endregion
#region 扩展字段
+ [NotMapped]
+ public string aiassname { get; set; }
#endregion
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoService.cs
index f36393504..430593381 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_UserChangeInfo/Ass_UserChangeInfoService.cs
@@ -35,9 +35,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
t.AIID,
t.UserID,
t.UCChangeTime,
- t.UCEditer
+ t.UCEditer,
+ aaii.aiassname
");
- strSql.Append(" FROM Ass_UserChangeInfo t ");
+ strSql.Append(" FROM Ass_UserChangeInfo t left join Ass_AssetsInfoItem aaii on aaii.AIId=t.AIID");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数