Explorar el Código

通话记录查询中部门添加全部选项

mengjie %!s(int64=8) %!d(string=hace) años
padre
commit
f1ccdbc52e

+ 7 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

165
 
165
 
166
                 if (modelList != null) {
166
                 if (modelList != null) {
167
                     if (modelList.Count > 0)
167
                     if (modelList.Count > 0)
168
+                    {
169
+                        modelList.Insert(0, new Model.TreeModel
170
+                        {
171
+                            id = "-1",
172
+                            text = "全部"
173
+                        });
168
                         return Success("加载成功", modelList);
174
                         return Success("加载成功", modelList);
175
+                    }
169
                 }
176
                 }
170
                 return Error("加载失败");
177
                 return Error("加载失败");
171
             }
178
             }

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

75
                 {
75
                 {
76
                     sql += " and UserCode='" + usercode + "'";
76
                     sql += " and UserCode='" + usercode + "'";
77
                 }
77
                 }
78
-                if (dept != null && dept.Trim() != "")
78
+                if (dept != null && dept.Trim() != "" && Convert.ToInt32(dept) >= 0)
79
                 {
79
                 {
80
                     sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
80
                     sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
81
                 }
81
                 }