Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Api

CallCenterApi/CallCenterApi.DAL/T_SMS_InternalMessages.cs

@@ -197,7 +197,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 * from T_SMS_InternalMessages ");
+            strSql.Append("select  top 1 * from T_SMS_InternalMessages  WITH(NOLOCK) ");
             strSql.Append(" where SMS_Id=@SMS_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@SMS_Id", SqlDbType.Int,4)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -222,7 +222,7 @@ namespace CallCenterApi.Interface.Controllers
                         string rid = dt.Rows[0]["F_RoleID"].ToString();
                         var role = new BLL.T_Sys_RoleInfo().GetModel(Int32.Parse(rid));
                         if (role.F_RoleCode == "EJWLDW" || role.F_RoleCode == "WLDW" || role.F_RoleCode=="DBZY"
-                            || role.F_RoleCode == "ZXLD" || role.F_RoleCode == "ZXLDGLY" || role.F_RoleCode == "GLY")
+                            || role.F_RoleCode == "ZXLD" || role.F_RoleCode == "ZXLDGLY" || role.F_RoleCode == "GLY" || role.F_RoleCode== "DDZG")
                         {
                             Dictionary<string, string> Dic = new Dictionary<string, string>();
                             Dic.Add("F_UserID", dt.Rows[0]["F_UserId"].ToString());

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -475,7 +475,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 sqltype += " and F_WorkState=9";
             }
-            sqltype += " and  F_InfoType=F_ValueId and " + where + ") Count from  dbo.T_Sys_DictionaryValue where F_ItemId=2 and F_State=0 ";
+            sqltype += " and  F_InfoType=F_ValueId and " + where + ") Count from  dbo.T_Sys_DictionaryValue where (F_PrentId=37 or F_ItemId=2) and F_State=0 ";
 
             DataTable dt = DbHelperSQL.Query(sqltype).Tables[0];
 
@@ -499,7 +499,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         [WechatActionFilter]
         public ActionResult GetTypeList()
         {
-            string sql = "select * from T_Sys_DictionaryValue where F_ItemId=2 and F_State=0 ";
+            string sql = "select * from T_Sys_DictionaryValue where (F_PrentId=37 or F_ItemId=2) and F_State=0 ";
             var dt = DbHelperSQL.Query(sql).Tables[0];
             return Success("列表加载成功", dt);
         }
@@ -523,7 +523,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         [WechatActionFilter]
         public ActionResult GetKeyList()
         {
-            string sql = "select * from T_Sys_DictionaryValue where F_ItemId=3 and F_State=0 ";
+            string sql = "select * from T_Sys_DictionaryValue where (F_PrentId=38 or F_ItemId=3) and F_State=0 ";
             var dt = DbHelperSQL.Query(sql).Tables[0];
             return Success("列表加载成功", dt);
         }