Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -4150,10 +4150,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult GetNoticeList(string[] usercode,string[] ddusercode,int isdc = 0)
+        public ActionResult GetNoticeList(string[] usercode, string[] ddusercode, int isdc = 0)//
         {
             DataTable dt = new DataTable();
-
+            //int userId = 8000;
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -4219,7 +4219,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //string codes = "";
                 for (int i = 0; i < usercode.Length; i++)
                 {
-                    newusercode += "'" + usercode[i] + "',"; 
+                    if (usercode[i] != "")
+                    {
+                        newusercode += "'" + usercode[i] + "',";
+                    }
                 }
                 newusercode = newusercode.Trim(',');
                 if (newusercode.Trim() != "" && newusercode != "undefined")
@@ -4233,7 +4236,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //string codes = "";
                 for (int i = 0; i < ddusercode.Length; i++)
                 {
-                    newusercode += "'" + ddusercode[i] + "',";
+                    if (ddusercode[i] != "")
+                    {
+                        newusercode += "'" + ddusercode[i] + "',";
+                    }
                 }
                 newusercode = newusercode.Trim(',');
                 if (newusercode.Trim() != "" && newusercode != "undefined")