112

HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs

@@ -108,7 +108,12 @@ namespace BLL
         /// <returns></returns>
         public static ListItem[] GetAllTeamGroupList(string projectId, string unitId)
         {
-            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId && x.UnitId == unitId orderby x.TeamGroupName select x).ToList();
+            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId  orderby x.TeamGroupName select x).ToList();
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                q = q.Where(x => x.UnitId == unitId).ToList();
+            }
+            
             ListItem[] lis = new ListItem[q.Count()];
 
             for (int i = 0; i < q.Count(); i++)

HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs

@@ -98,6 +98,7 @@ namespace BLL
                 SystemNumber = weldJoint.SystemNumber,
                 Remark = weldJoint.Remark,
                 IsGoldJoint = weldJoint.IsGoldJoint,
+                IsPMI=weldJoint.IsPMI,
                 WPQId = weldJoint.WPQId,
                 DetectionType = weldJoint.DetectionType,
                 PageNum = weldJoint.PageNum,