Browse Source

工单类型和知识库混淆

MicroWin10-1604\Administrator 7 years ago
parent
commit
e7871a464b

+ 2 - 2
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeClassController.cs

34
 
34
 
35
                 DataTable dt = new DataTable();
35
                 DataTable dt = new DataTable();
36
                 string pid = HttpUtility.UrlDecode(RequestString.GetQueryString("pid"));
36
                 string pid = HttpUtility.UrlDecode(RequestString.GetQueryString("pid"));
37
-                string sql = " and F_DeleteFlag=0";
37
+                string sql = " and F_DeleteFlag=0 and F_CategoryType is null";
38
                 if (pid.Trim() != "")
38
                 if (pid.Trim() != "")
39
                 {
39
                 {
40
                     sql += " and F_ParentId=" + pid.Trim();
40
                     sql += " and F_ParentId=" + pid.Trim();
70
                     model.id = currentID;
70
                     model.id = currentID;
71
                     model.IconCls = "";//图标
71
                     model.IconCls = "";//图标
72
                     model.text = categorylist[i].F_CategoryName;
72
                     model.text = categorylist[i].F_CategoryName;
73
-                    tab2 = new BLL.T_RepositoryCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by F_Sort").Tables[0];
73
+                    tab2 = new BLL.T_RepositoryCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 and F_CategoryType is null order by F_Sort").Tables[0];
74
                     if (tab2 != null && tab2.Rows.Count > 0)
74
                     if (tab2 != null && tab2.Rows.Count > 0)
75
                     {
75
                     {
76
                         model.children = BindTree(tab2, currentID);
76
                         model.children = BindTree(tab2, currentID);

+ 4 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkTypeController.cs

4
 using System.Data;
4
 using System.Data;
5
 using System.Linq;
5
 using System.Linq;
6
 using System.Web;
6
 using System.Web;
7
-using System.ServiceModel;
8
-using System.ServiceModel.Web;
7
+//using System.ServiceModel;
8
+//using System.ServiceModel.Web;
9
 using System.Runtime.Serialization;
9
 using System.Runtime.Serialization;
10
 using System.Web.Mvc;
10
 using System.Web.Mvc;
11
 using System.Web.Script.Serialization;
11
 using System.Web.Script.Serialization;
32
                     dt = new BLL.T_RepositoryCategory().GetList("F_ParentId=0 and F_DeleteFlag=0 and F_CategoryType=1").Tables[0];
32
                     dt = new BLL.T_RepositoryCategory().GetList("F_ParentId=0 and F_DeleteFlag=0 and F_CategoryType=1").Tables[0];
33
                     if (dt != null && dt.Rows.Count > 0)
33
                     if (dt != null && dt.Rows.Count > 0)
34
                     {
34
                     {
35
-                        System.Collections.Generic.List<Model.TreeModel> modelList = BindTree(dt, "0");
35
+                        System.Collections.Generic.List<Model.TreeModel > modelList = BindTree(dt, "0");
36
                         //将对象转为json字符串
36
                         //将对象转为json字符串
37
                         //resstr = new JavaScriptSerializer().Serialize(modelList);
37
                         //resstr = new JavaScriptSerializer().Serialize(modelList);
38
                         res = Success("获取成功", modelList);
38
                         res = Success("获取成功", modelList);
173
                     model.id = currentID;
173
                     model.id = currentID;
174
                     model.IconCls = "";//图标
174
                     model.IconCls = "";//图标
175
                     model.text = categorylist[i].F_CategoryName;
175
                     model.text = categorylist[i].F_CategoryName;
176
-                    tab2 = new BLL.T_RepositoryCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by F_Sort").Tables[0];
176
+                    tab2 = new BLL.T_RepositoryCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 and F_CategoryType=1 order by F_Sort").Tables[0];
177
                     if (tab2 != null && tab2.Rows.Count > 0)
177
                     if (tab2 != null && tab2.Rows.Count > 0)
178
                     {
178
                     {
179
                         model.children = BindTree(tab2, currentID);
179
                         model.children = BindTree(tab2, currentID);