fix:角色问题以及知识库报错问题

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -466,9 +466,19 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetUsersList(string rolecode)
         {
             var sql = " 1=1 ";
+
             if (!string.IsNullOrWhiteSpace(rolecode.Trim()))
             {
-                string F_RoleId = DbHelperSQL.GetSingle("select F_RoleId from T_Sys_RoleInfo with(nolock) where F_RoleCode='" + rolecode.Trim() + "'")?.ToString() ?? "0";
+                string F_RoleId = "";
+                Regex reg = new Regex("^[0-9]*$");
+                if (reg.IsMatch(rolecode.Trim()))
+                {
+                    F_RoleId = rolecode.Trim();
+                }
+                else
+                {
+                    F_RoleId = DbHelperSQL.GetSingle("select F_RoleId from T_Sys_RoleInfo with(nolock) where F_RoleCode='" + rolecode.Trim() + "'")?.ToString() ?? "0";
+                }
 
                 sql += " and F_RoleId = " + F_RoleId;
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -51,15 +51,15 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             if (content != null && content.Trim() != "")
             {
-                sql += " and F_Content like '%" + content.Trim() + "%'";
+                sql += " and F_Description like '%" + content.Trim() + "%'";
             }
             if (pid != null && pid.Trim() != "")
             {
                 sql += " and F_CategoryId=" + pid.Trim();
             }
-                                                                                                                                                                                                 if (keywords != null && keywords.Trim() != "")
+                                                                                                                                                                                     if (keywords != null && keywords.Trim() != "")
             {
-                sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
+                sql += " and (F_Description like '%" + keywords.Trim() + "%' or F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                                                                                                                                                                                                  + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
             }
             if (strpageindex.Trim() != "")

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

@@ -427,7 +427,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (newusercode.Trim() != "" && newusercode != "undefined")
                     {
                         sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
-                             "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  = '" + newusercode + "') ";
+                             "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  = " + newusercode + ") ";
                     }
                 }
             }