@@ -162,7 +162,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||
public ActionResult GetPageList(string pagination, string queryJson) | |||
{ | |||
Pagination paginationobj = pagination.ToObject<Pagination>(); | |||
var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1); | |||
var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson); | |||
foreach (var item in data) | |||
{ | |||
@@ -8,23 +8,23 @@ | |||
<input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" > | |||
<div class="lr-form-item-title">接收对象<font face="宋体">*</font></div> | |||
<div id="SendType" isvalid="yes" checkexpession="NotNull" ></div> | |||
<div class="lr-form-item-title">接收对象</div> | |||
<div id="SendType"></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="ReceiverIddiv"> | |||
<div class="lr-form-item-title">接收人<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收人</div> | |||
<div id="ReceiverUserId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="DeptIddiv"> | |||
<div class="lr-form-item-title">接收部门<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收部门</div> | |||
<div id="DeptId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="PostIddiv"> | |||
<div class="lr-form-item-title">接收岗位<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收岗位</div> | |||
<div id="PostId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="CompanyIddiv"> | |||
<div class="lr-form-item-title">接收校区<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收校区</div> | |||
<div id="CompanyId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" > | |||
@@ -35,8 +35,10 @@ var bootstrap = function ($, learun) { | |||
if (item != null && item != undefined) { | |||
if (item.id === 1 || item.id === "1") { | |||
$("#CompanyIddiv").show(); | |||
$("#CompanyId").attr("isvalid", "yes"); | |||
$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
//$("#CompanyId").attr("isvalid", "yes"); | |||
//$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#DeptIddiv").hide(); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
@@ -51,8 +53,10 @@ var bootstrap = function ($, learun) { | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptIddiv").show(); | |||
$("#DeptId").attr("isvalid", "yes"); | |||
$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
//$("#DeptId").attr("isvalid", "yes"); | |||
//$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverIddiv").hide(); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
@@ -105,8 +109,10 @@ var bootstrap = function ($, learun) { | |||
$('[data-table="' + id + '"]').lrSetFormData(data[id]); | |||
if (data[id].SendType === 1 || data[id].SendType == "1") { | |||
$("#CompanyIddiv").show(); | |||
$("#CompanyId").attr("isvalid", "yes"); | |||
$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
//$("#CompanyId").attr("isvalid", "yes"); | |||
//$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#DeptIddiv").hide(); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
@@ -122,8 +128,10 @@ var bootstrap = function ($, learun) { | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptIddiv").show(); | |||
$("#DeptId").attr("isvalid", "yes"); | |||
$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
//$("#DeptId").attr("isvalid", "yes"); | |||
//$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverIddiv").hide(); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
@@ -153,8 +161,10 @@ var bootstrap = function ($, learun) { | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#ReceiverIddiv").show(); | |||
$("#ReceiverUserId").attr("isvalid", "yes"); | |||
$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
//$("#ReceiverUserId").attr("isvalid", "yes"); | |||
//$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#PostIddiv").hide(); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
@@ -255,10 +265,18 @@ var bootstrap = function ($, learun) { | |||
var sendtype = $('#SendType').lrselectGet(); | |||
if (sendtype == "1") { | |||
formData.ReceiverId = $("#CompanyId").lrselectGet(); | |||
formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); | |||
if (($("#CompanyId").find(".lr-select-placeholder").text()).indexOf('请选择') != -1) { | |||
formData.Receiver = ""; | |||
} else { | |||
formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); | |||
} | |||
} else if (sendtype == "2") { | |||
formData.ReceiverId = $("#DeptId").lrselectGet(); | |||
formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); | |||
if (($("#DeptId").find(".lr-select-placeholder").text()).indexOf('请选择') != -1) { | |||
formData.Receiver = ""; | |||
} else { | |||
formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); | |||
} | |||
} else if (sendtype == "3") { | |||
formData.ReceiverId = $("#PostId").lrselectGet(); | |||
formData.Receiver = $("#PostId").find(".lr-select-placeholder").text(); | |||
@@ -8,25 +8,29 @@ | |||
<input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" > | |||
<div class="lr-form-item-title">接收对象<font face="宋体">*</font></div> | |||
<div id="SendType" isvalid="yes" checkexpession="NotNull" ></div> | |||
<div class="lr-form-item-title">接收对象</div> | |||
<div id="SendType" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="ReceiverIddiv"> | |||
<div class="lr-form-item-title">接收人<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收人</div> | |||
<div id="ReceiverUserId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="DeptIddiv"> | |||
<div class="lr-form-item-title">接收部门<font face="宋体">*</font></div> | |||
<div id="DeptId" ></div> | |||
<div class="lr-form-item-title">接收部门</div> | |||
<div id="DeptId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="PostIddiv"> | |||
<div class="lr-form-item-title">接收岗位<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收岗位</div> | |||
<div id="PostId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="CompanyIddiv"> | |||
<div class="lr-form-item-title">接收校区<font face="宋体">*</font></div> | |||
<div class="lr-form-item-title">接收校区</div> | |||
<div id="CompanyId" ></div> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" > | |||
<div class="lr-form-item-title">文号<font face="宋体">*</font></div> | |||
<input id="DocNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | |||
</div> | |||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" > | |||
<div class="lr-form-item-title">文件</div> | |||
<div id="Url" ></div> | |||
@@ -35,8 +35,10 @@ var bootstrap = function ($, learun) { | |||
if (item != null && item != undefined) { | |||
if (item.id === 1 || item.id === "1") { | |||
$("#CompanyIddiv").show(); | |||
$("#CompanyId").attr("isvalid", "yes"); | |||
$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
//$("#CompanyId").attr("isvalid", "yes"); | |||
//$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#DeptIddiv").hide(); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
@@ -51,8 +53,10 @@ var bootstrap = function ($, learun) { | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptIddiv").show(); | |||
$("#DeptId").attr("isvalid", "yes"); | |||
$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
//$("#DeptId").attr("isvalid", "yes"); | |||
//$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverIddiv").hide(); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
@@ -65,13 +69,15 @@ var bootstrap = function ($, learun) { | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptIddiv").hide(); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#DeptId").removeAttr("checkexpession"); | |||
$("#ReceiverIddiv").hide(); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
$("#PostIddiv").show(); | |||
$("#PostId").attr("isvalid", "yes"); | |||
$("#PostId").attr("checkexpession", "NotNull"); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
//$("#PostId").attr("isvalid", "yes"); | |||
//$("#PostId").attr("checkexpession", "NotNull"); | |||
} else { | |||
$("#CompanyIddiv").hide(); | |||
$("#CompanyId").removeAttr("isvalid"); | |||
@@ -80,16 +86,25 @@ var bootstrap = function ($, learun) { | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#ReceiverIddiv").show(); | |||
$("#ReceiverUserId").attr("isvalid", "yes"); | |||
$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
//$("#ReceiverUserId").attr("isvalid", "yes"); | |||
//$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#PostIddiv").hide(); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
} | |||
} else { | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
} | |||
} | |||
}); | |||
$('#SendType').lrselectSet("2"); | |||
$('#SendType').lrselectSet("1"); | |||
$('#Url').lrUploader(); | |||
var ContentsUE = UE.getEditor('Contents'); | |||
$('#Contents')[0].ue = ContentsUE; | |||
@@ -153,8 +168,10 @@ var bootstrap = function ($, learun) { | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#ReceiverIddiv").show(); | |||
$("#ReceiverUserId").attr("isvalid", "yes"); | |||
$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
//$("#ReceiverUserId").attr("isvalid", "yes"); | |||
//$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#PostIddiv").hide(); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
@@ -182,8 +199,10 @@ var bootstrap = function ($, learun) { | |||
$('[data-table="' + id + '"]').lrSetFormData(data[id]); | |||
if (data[id].SendType === 1 || data[id].SendType == "1") { | |||
$("#CompanyIddiv").show(); | |||
$("#CompanyId").attr("isvalid", "yes"); | |||
$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
//$("#CompanyId").attr("isvalid", "yes"); | |||
//$("#CompanyId").attr("checkexpession", "NotNull"); | |||
$("#DeptIddiv").hide(); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
@@ -199,8 +218,10 @@ var bootstrap = function ($, learun) { | |||
$("#CompanyId").removeAttr("isvalid"); | |||
$("#CompanyId").removeAttr("NotNull"); | |||
$("#DeptIddiv").show(); | |||
$("#DeptId").attr("isvalid", "yes"); | |||
$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
//$("#DeptId").attr("isvalid", "yes"); | |||
//$("#DeptId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverIddiv").hide(); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
@@ -219,8 +240,10 @@ var bootstrap = function ($, learun) { | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
$("#PostIddiv").show(); | |||
$("#PostId").attr("isvalid", "yes"); | |||
$("#PostId").attr("checkexpession", "NotNull"); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
//$("#PostId").attr("isvalid", "yes"); | |||
//$("#PostId").attr("checkexpession", "NotNull"); | |||
$("#PostId").lrselectSet(data[id].ReceiverId); | |||
} else { | |||
$("#CompanyIddiv").hide(); | |||
@@ -230,8 +253,10 @@ var bootstrap = function ($, learun) { | |||
$("#DeptId").removeAttr("isvalid"); | |||
$("#DeptId").removeAttr("NotNull"); | |||
$("#ReceiverIddiv").show(); | |||
$("#ReceiverUserId").attr("isvalid", "yes"); | |||
$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#ReceiverUserId").removeAttr("isvalid"); | |||
$("#ReceiverUserId").removeAttr("NotNull"); | |||
//$("#ReceiverUserId").attr("isvalid", "yes"); | |||
//$("#ReceiverUserId").attr("checkexpession", "NotNull"); | |||
$("#PostIddiv").hide(); | |||
$("#PostId").removeAttr("isvalid"); | |||
$("#PostId").removeAttr("NotNull"); | |||
@@ -255,16 +280,31 @@ var bootstrap = function ($, learun) { | |||
var sendtype = $('#SendType').lrselectGet(); | |||
if (sendtype == "1") { | |||
formData.ReceiverId = $("#CompanyId").lrselectGet(); | |||
formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); | |||
if (($("#CompanyId").find(".lr-select-placeholder").text()).indexOf('请选择') != -1) { | |||
formData.Receiver = ""; | |||
} else { | |||
formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); | |||
} | |||
} else if (sendtype == "2") { | |||
formData.ReceiverId = $("#DeptId").lrselectGet(); | |||
formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); | |||
if (($("#DeptId").find(".lr-select-placeholder").text()).indexOf('请选择') != -1) { | |||
formData.Receiver = ""; | |||
} else { | |||
formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); | |||
} | |||
} else if (sendtype == "3") { | |||
formData.ReceiverId = $("#PostId").lrselectGet(); | |||
formData.Receiver = $("#PostId").find(".lr-select-placeholder").text(); | |||
} else { | |||
formData.ReceiverId = $("#ReceiverUserId").lrformselectGet(); | |||
formData.Receiver = $("#ReceiverUserId").find("span").text(); | |||
if (($("#ReceiverUserId").find("span").text()).indexOf('请选择') != -1) { | |||
formData.Receiver = ""; | |||
} else { | |||
formData.Receiver = $("#ReceiverUserId").find("span").text(); | |||
} | |||
} | |||
if (!!processId) { | |||
formData.SProcessId = processId; | |||
@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) { | |||
}); | |||
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) { | |||
page.search(queryJson); | |||
}, 220, 400); | |||
}, 250, 400); | |||
// 刷新 | |||
$('#lr_refresh').on('click', function () { | |||
location.reload(); | |||
@@ -304,7 +304,7 @@ var bootstrap = function ($, learun) { | |||
param.StartTime = startTime; | |||
param.EndTime = endTime; | |||
param.ReceiverId = param.DeptId + param.ReceiverUserId + param.PostId + param.CompanyId; | |||
param.SqlParameter = ' AND SendFlag<>4'; | |||
param.SqlParameter = ' AND SendFlag<>4 and STypeId=1'; | |||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | |||
} | |||
}; | |||
@@ -17,6 +17,7 @@ | |||
var desktopData = {}; | |||
var sourceData = {}; | |||
var userData = {}; | |||
var dataItemData = {}; | |||
function initLoad(callback) { | |||
var res = loadSate.yes; | |||
@@ -102,7 +103,7 @@ | |||
update: function (name) { | |||
clientAsyncData[name].update && clientAsyncData[name].update(); | |||
}, | |||
getAsyncReal:function(name, op) { | |||
getAsyncReal: function (name, op) { | |||
clientAsyncData[name].states = 1; | |||
return clientAsyncData[name].get(op); | |||
} | |||
@@ -311,7 +312,7 @@ | |||
//var data = storage.get("userData").data || {}; | |||
var data = userData.data || {}; | |||
var keys = (op.key || '').split(','); | |||
var array=new Array(); | |||
var array = new Array(); | |||
if (keys.length > 1) { | |||
$.each(keys, | |||
function (i, item) { | |||
@@ -346,13 +347,17 @@ | |||
init: function () { | |||
if (clientAsyncData.dataItem.states == loadSate.no) { | |||
clientAsyncData.dataItem.states = loadSate.ing; | |||
var ver = storage.get("dataItemData").ver || ""; | |||
var ver = "";// storage.get("dataItemData").ver || ""; | |||
if (dataItemData) { | |||
ver = dataItemData.ver || ""; | |||
} | |||
learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DataItem/GetMap', { ver: ver }, function (data) { | |||
if (!data) { | |||
clientAsyncData.dataItem.states = loadSate.fail; | |||
} else { | |||
if (data.ver) { | |||
storage.set("dataItemData", data); | |||
dataItemData = data; | |||
//storage.set("dataItemData", data); | |||
} | |||
clientAsyncData.dataItem.states = loadSate.yes; | |||
clientAsyncData.db.init(); | |||
@@ -368,7 +373,7 @@ | |||
}, 100);// 如果还在加载100ms后再检测 | |||
} | |||
else { | |||
var data = storage.get("dataItemData").data || {}; | |||
var data = dataItemData.data || {};// storage.get("dataItemData").data || {}; | |||
// 数据字典翻译 | |||
var _item = clientAsyncData.dataItem.find(op.key, data[op.code] || {}); | |||
@@ -391,7 +396,7 @@ | |||
}, 100);// 如果还在加载100ms后再检测 | |||
} | |||
else { | |||
var data = storage.get("dataItemData").data || {}; | |||
var data = dataItemData.data || {};//storage.get("dataItemData").data || {}; | |||
var res = {}; | |||
$.each(data[op.code] || {}, function (_index, _item) { | |||
_item.text = top.learun.language.getSyn(_item.text); | |||
@@ -408,7 +413,7 @@ | |||
}, 100);// 如果还在加载100ms后再检测 | |||
} | |||
else { | |||
var data = storage.get("dataItemData").data || {}; | |||
var data = dataItemData || {};//storage.get("dataItemData").data || {}; | |||
var keyList = (op.key || "").split(','); | |||
var _text = [] | |||
@@ -529,7 +534,7 @@ | |||
} | |||
}, | |||
load: function (code) { | |||
// var ver = storage.get("sourceData_" + code).ver || ""; | |||
// var ver = storage.get("sourceData_" + code).ver || ""; | |||
var ver = ""; | |||
if (sourceData["sourceData_" + code]) { | |||
ver = sourceData["sourceData_" + code].ver || ""; | |||
@@ -74,7 +74,7 @@ namespace Learun.Application.Base.SystemModule | |||
try | |||
{ | |||
StringBuilder strSql = new StringBuilder(); | |||
strSql.Append("SELECT " + fieldSql + " FROM LR_Base_DataItem t WHERE t.F_DeleteMark = 0 Order By t.F_ParentId,t.F_SortCode "); | |||
strSql.Append("SELECT " + fieldSql + " FROM LR_Base_DataItem t WHERE t.F_DeleteMark = 0 and t.F_EnabledMark=1 Order By t.F_ParentId,t.F_SortCode "); | |||
return this.BaseRepository().FindList<DataItemEntity>(strSql.ToString()); | |||
} | |||
catch (Exception ex) | |||
@@ -161,7 +161,7 @@ namespace Learun.Application.Base.SystemModule | |||
StringBuilder strSql = new StringBuilder(); | |||
strSql.Append("SELECT " + detailFieldSql + @" FROM LR_Base_DataItemDetail t | |||
INNER JOIN LR_Base_DataItem t2 ON t.F_ItemId = t2.F_ItemId | |||
WHERE t2.F_ItemCode = @itemCode AND t.F_DeleteMark = 0 Order By t.F_SortCode | |||
WHERE t2.F_ItemCode = @itemCode AND t.F_DeleteMark = 0 and t.F_EnabledMark=1 Order By t.F_SortCode | |||
"); | |||
return this.BaseRepository().FindList<DataItemDetailEntity>(strSql.ToString(), new { itemCode = itemCode }); | |||
} | |||