Merge branch 'master' of http://192.168.1.222:3000/lihai/PingAnYeXianSZCG_API

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -165,7 +165,14 @@ namespace CallCenterApi.Interface.Controllers
 
                 if (modelList != null) {
                     if (modelList.Count > 0)
+                    {
+                        modelList.Insert(0, new Model.TreeModel
+                        {
+                            id = "-1",
+                            text = "全部"
+                        });
                         return Success("加载成功", modelList);
+                    }
                 }
                 return Error("加载失败");
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Question/QuestionnaireController.cs

@@ -1214,6 +1214,11 @@ namespace CallCenterApi.Interface.Controllers.Question
             string enddate = HttpUtility.UrlDecode(RequestString.GetQueryString("enddate"))+ " 23:59:59";
             //startdate = "2017-11-12 00:00:00";
             //enddate = "2017-11-14 23:59:59";
+            if (HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == null || HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == "")
+            {
+                startdate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                enddate = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+            }
             DataTable dtnew = new DataTable();
             dtnew.Columns.Add("xiangzhen",Type.GetType("System.String"));
             dtnew.Columns.Add("zongshu", Type.GetType("System.Int32"));
@@ -1274,6 +1279,11 @@ namespace CallCenterApi.Interface.Controllers.Question
             ActionResult res = NoToken("未知错误，请重新登录");
             string startdate = HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) + " 00:00:00";
             string enddate = HttpUtility.UrlDecode(RequestString.GetQueryString("enddate")) + " 23:59:59";
+            if (HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == null || HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == "")
+            {
+                startdate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                enddate = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+            }
             //startdate = "2017-11-12 00:00:00";
             //enddate = "2017-11-14 23:59:59";
             DataTable dtnew = new DataTable();
@@ -1345,6 +1355,11 @@ namespace CallCenterApi.Interface.Controllers.Question
             ActionResult res = NoToken("未知错误，请重新登录");
             string startdate = HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) + " 00:00:00";
             string enddate = HttpUtility.UrlDecode(RequestString.GetQueryString("enddate")) + " 23:59:59";
+            if (HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == null || HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == "")
+            {
+                startdate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                enddate = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+            }
             //startdate = "2017-11-12 00:00:00";
             //enddate = "2017-11-14 23:59:59";
             DataTable dtnew = new DataTable();
@@ -1418,6 +1433,11 @@ namespace CallCenterApi.Interface.Controllers.Question
             ActionResult res = NoToken("未知错误，请重新登录");
             string startdate = HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) + " 00:00:00";
             string enddate = HttpUtility.UrlDecode(RequestString.GetQueryString("enddate")) + " 23:59:59";
+            if (HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == null || HttpUtility.UrlDecode(RequestString.GetQueryString("startdate")) == "")
+            {
+                startdate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                enddate = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+            }
             //startdate = "2017-11-12 00:00:00";
             //enddate = "2017-11-14 23:59:59";
             DataTable dtnew = new DataTable();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -75,7 +75,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     sql += " and UserCode='" + usercode + "'";
                 }
-                if (dept != null && dept.Trim() != "")
+                if (dept != null && dept.Trim() != "" && Convert.ToInt32(dept) >= 0)
                 {
                     sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
                 }