合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -117,6 +117,18 @@ namespace FineUIPro.Web.HSSE.InformationProject
            {
                laws = laws.Where(x => x.LawRegulationName.Contains(this.txtLawRegulationName.Text.Trim()));
            }
+            if (!string.IsNullOrEmpty(drpIsBuild.SelectedValue))
+            {
+                if (drpIsBuild.SelectedValue == "1")
+                {
+                    laws = laws.Where(x => x.IsBuild==true);
+
+                }
+                else
+                {
+                    laws = laws.Where(x => x.IsBuild == false);
+                }
+            }
            var q = from x in laws
                    orderby x.LawRegulationCode
                    select new
@@ -128,6 +140,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
                        x.EffectiveDate,
                        x.Description,
                        x.AttachUrl,
+                        x.IsBuildName,
                        ShortDescription = Funs.GetSubStr(x.Description, 45),
                        x.LawsRegulationsTypeId,
                        x.LawsRegulationsTypeName,
@@ -147,5 +160,18 @@ namespace FineUIPro.Web.HSSE.InformationProject
        {
            this.BindGrid();
        }
+        public static string ConvertIsBuild(object isBuild)
+        {
+            if (isBuild != null)
+            {
+                 if (isBuild.ToString() =="1")
+                {
+                    return isBuild.ToString();
+                }
+            }
+            return null;
+        }
+
+        
    }
 }