Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

2024-08-19 09:21:38 +08:00
parent 3550951075 012f59da32
commit d8438a5c76
57 changed files with 1382 additions and 839 deletions
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.Check
            if (e.Node.CommandName == "ProjectType")   //展开工程类型
            {
                var trUnitWork = from x in Funs.DB.WBS_UnitWork
-                                 where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
+                                 where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == e.Node.NodeID
                                 select x;
                trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
                if (trUnitWork.Count() > 0)