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

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Model;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
@@ -602,7 +603,16 @@ namespace BLL
                     string pushContent = string.Empty;
                     string contenttype = "application/json;charset=unicode";
                     string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam";
-                    var getProjects = from x in db.RealName_Project where proCode == null || x.ProCode == proCode select x;
+                    List < RealName_Project >  getProjects;
+                    if (string.IsNullOrEmpty(proCode))
+                    {
+                        List<string> proCodes = Funs.DB.Base_Project.Where(x => x.ProjectState == "1" || x.ProjectState == null).Select(x => x.ProjectCode).ToList();
+                        getProjects = (from x in db.RealName_Project where proCodes.Contains(x.ProCode) select x).ToList();
+                    }
+                    else
+                    {
+                        getProjects = (from x in db.RealName_Project where x.ProCode == proCode select x).ToList();
+                    }
                     foreach (var citem in getProjects)
                     {
                         var getProject = new

SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.cs

@@ -38,7 +38,7 @@ namespace FineUIPro.Web.BaseInfo
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,,wp.IsCQMSCheck,wp.CNCodes,
+            string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.IsCQMSCheck,wp.CNCodes,
                                             case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
                                             FROM dbo.Base_WorkPost AS wp
                                             LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' ";