合并最新

SGGL/BLL/API/APIBaseInfoService.cs

@@ -435,6 +435,23 @@ namespace BLL
         }
         #endregion
 
+        #region 获取部门信息
+        /// <summary>
+        /// 获取部门信息
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.BaseInfoItem> getBaseDepart(string strParam)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getDataLists = (from x in db.Base_Depart
+                                    where strParam == null || x.DepartName.Contains(strParam)
+                                    orderby x.DepartName
+                                    select new Model.BaseInfoItem { BaseInfoId = x.DepartId, BaseInfoCode = x.DepartCode, BaseInfoName = x.DepartName }).ToList();
+                return getDataLists;
+            }
+        }
+        #endregion
         #region 获取岗位信息
         /// <summary>
         /// 获取岗位信息
@@ -459,12 +476,12 @@ namespace BLL
                 var getDataLists = (from x in db.Base_WorkPost
                                     where strParam == null || x.WorkPostName.Contains(strParam)
                                     orderby x.WorkPostName
-                                    select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId, BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList();
+                                    select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId.ToUpper(), BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList();
                 if (!string.IsNullOrEmpty(projectId))
                 {
                     var user = from u in db.SitePerson_Person
                                where u.ProjectId == projectId
-                               select u.WorkPostId;
+                               select u.WorkPostId.ToUpper();
                     var postIds = user.Distinct();
 
                     foreach (var item in getDataLists)