diff --git a/SGGL/BLL/API/HSSE/APIResourcesService.cs b/SGGL/BLL/API/HSSE/APIResourcesService.cs
index 1aab6df0..21ccacce 100644
--- a/SGGL/BLL/API/HSSE/APIResourcesService.cs
+++ b/SGGL/BLL/API/HSSE/APIResourcesService.cs
@@ -357,22 +357,42 @@ namespace BLL
///
/// 1-checkType;2-专项检查;3-综合检查
///
- public static List getCheckItemSetListBySupCheckItemId(string supTypeId, string checkType)
+ public static List getCheckItemSetListBySupCheckItemId(string supTypeId, string checkType,string supName="")
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
- var getDataLists = from x in db.Technique_CheckItemSet
- where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
- orderby x.SortIndex
- select new Model.ResourcesItem
- {
- ResourcesId = x.CheckItemSetId,
- ResourcesCode = x.MapCode,
- ResourcesName = x.CheckItemName,
- SupResourcesId = x.SupCheckItem,
- IsEndLever = x.IsEndLever,
- };
- return getDataLists.ToList();
+ if (!string.IsNullOrEmpty(supName))
+ {
+ var getDataLists = from x in db.Technique_CheckItemSet
+ where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
+ && x.CheckItemName.Contains(supName)
+ orderby x.SortIndex
+ select new Model.ResourcesItem
+ {
+ ResourcesId = x.CheckItemSetId,
+ ResourcesCode = x.MapCode,
+ ResourcesName = x.CheckItemName,
+ SupResourcesId = x.SupCheckItem,
+ IsEndLever = x.IsEndLever,
+ };
+ return getDataLists.ToList();
+ }
+ else {
+ var getDataLists = from x in db.Technique_CheckItemSet
+ where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
+ orderby x.SortIndex
+ select new Model.ResourcesItem
+ {
+ ResourcesId = x.CheckItemSetId,
+ ResourcesCode = x.MapCode,
+ ResourcesName = x.CheckItemName,
+ SupResourcesId = x.SupCheckItem,
+ IsEndLever = x.IsEndLever,
+ };
+ return getDataLists.ToList();
+ }
+
+
}
}