|
|
@@ -58,13 +58,13 @@ namespace CallCenterApi.Interface.Controllers.Wiki
|
|
58
|
58
|
/// <param name="pagesize"></param>
|
|
59
|
59
|
/// <param name="isdc"></param>
|
|
60
|
60
|
/// <returns></returns>
|
|
61
|
|
- public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
|
|
|
61
|
+ public ActionResult GetList(string keyvalue, int page = 1, int pagesize = 10, int isdc = 0)
|
|
62
|
62
|
{
|
|
63
|
63
|
DataTable dt = new DataTable();
|
|
64
|
64
|
string sql = " and F_IsDelete=0 ";
|
|
65
|
65
|
string sqldt = "";
|
|
66
|
66
|
|
|
67
|
|
- string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
|
|
|
67
|
+ string strzhengcemingci = HttpUtility.UrlDecode(RequestString.GetQueryString("zhengcemingci"));
|
|
68
|
68
|
string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
|
|
69
|
69
|
int key = RequestString.GetInt("key", 0);
|
|
70
|
70
|
|
|
|
@@ -72,9 +72,9 @@ namespace CallCenterApi.Interface.Controllers.Wiki
|
|
72
|
72
|
{
|
|
73
|
73
|
sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
|
|
74
|
74
|
}
|
|
75
|
|
- if (strdanwei.Trim() != "" && strdanwei != "undefined")
|
|
|
75
|
+ if (strzhengcemingci.Trim() != "" && strzhengcemingci != "undefined")
|
|
76
|
76
|
{
|
|
77
|
|
- sql += " and F_DanWei like '%" + strdanwei + "%' ";
|
|
|
77
|
+ sql += " and F_ZhengCeMingCi like '%" + strzhengcemingci + "%' ";
|
|
78
|
78
|
}
|
|
79
|
79
|
if (key > 0)
|
|
80
|
80
|
{
|
|
|
@@ -82,6 +82,10 @@ namespace CallCenterApi.Interface.Controllers.Wiki
|
|
82
|
82
|
|
|
83
|
83
|
sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
|
|
84
|
84
|
}
|
|
|
85
|
+ if (!string.IsNullOrEmpty(keyvalue))
|
|
|
86
|
+ {
|
|
|
87
|
+ sql += " and (F_ZhengCeMingCi like '%" + keyvalue + "%' or F_QiTaShuoMing like '%" + keyvalue + "%' or F_BanLiLiuCheng like '%" + keyvalue + "%' or F_BeiZhu like '%" + keyvalue + "%')";
|
|
|
88
|
+ }
|
|
85
|
89
|
|
|
86
|
90
|
string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
|
|
87
|
91
|
|