页面修改

Mall.Common/Enum/ApiRequestFromEnum.cs

 using Mall.Common.Plugin;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace Mall.Common.Enum
 {
@@ -18,18 +12,17 @@ namespace Mall.Common.Enum
         /// </summary>
         [EnumField("Web端")]
         Web = 1,
+
         /// <summary>
         /// 小程序
         /// </summary>
         [EnumField("小程序")]
         MiniProgram = 2,
+
         /// <summary>
         /// erp
         /// </summary>
         [EnumField("erp")]
         ERP = 3,  
-
-        
-
     }
 }
\ No newline at end of file

Mall.Module.TradePavilion/CommerceConsultModule.cs

@@ -77,6 +77,9 @@ namespace Mall.Module.TradePavilion
                 {
                     QActivityIds = activityIds,
                     QUserIds = userids,
+                    CompanyName=query.CompanyName,
+                    LinkMan=query.LinkMan,
+                    UserId=query.UserId,
                 });
                 foreach (var item in userList)
                 {

Mall.Repository/TradePavilion/RB_Commerce_ConsultRepository.cs

@@ -67,6 +67,11 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Consult_Extend.LinkMan));
                     parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
                 }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @CompanyName ", nameof(RB_Commerce_Consult_Extend.CompanyName));
+                    parameters.Add("CompanyName", "%" + query.CompanyName.Trim() + "%");
+                }
                 if (query.ActivityId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.ActivityId);
@@ -136,6 +141,11 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Consult_Extend.LinkMan));
                     parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
                 }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @CompanyName ", nameof(RB_Commerce_Consult_Extend.CompanyName));
+                    parameters.Add("CompanyName", "%" + query.CompanyName.Trim() + "%");
+                }
                 if (query.ActivityId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.ActivityId);

Mall.WebApi/Filter/ApiFilterAttribute.cs

@@ -359,62 +359,5 @@ namespace Mall.WebApi.Filter
             }
             #endregion
         }
-
-        /// <summary>
-        /// 权限校验
-        /// </summary>
-        /// <param name="actionContext"></param>
-        private static void PermissionValidat(ActionExecutingContext actionContext)
-        {
-            string uid = actionContext.HttpContext.Items[GlobalKey.TokenUserInfo] != null ? JsonConvert.DeserializeObject<TokenUserInfo>(actionContext.HttpContext.Items[GlobalKey.TokenUserInfo].ToString()).uid : "0";
-            //TODO查询用户权限
-            string url = actionContext.HttpContext.Request.GetAbsoluteUri();
-            bool havPermission = true;
-
-            //List<object> args = new List<object>() {
-            //    uid
-            //};
-
-            //根据uid 判断用户是否拥有该权限
-            //Type type = (Type)_obj;
-            //MethodInfo meth = type.GetMethod(model.Method);
-            //try
-            //{
-            //    permission = (string)meth.Invoke(Activator.CreateInstance(type), args.ToArray());
-            //}
-            //catch
-            //{
-            //}
-            //if (!string.IsNullOrWhiteSpace(permission))
-            //{
-            //    if (permission.ToLower().Contains(url.ToLower()))
-            //    {
-            //        havPermission = true;
-            //    }
-            //    else//判断菜单是否存在
-            //    {
-            //        bool systemIsExit = RbUserCache.GetSystemHasMenu(url.ToLower());
-            //        if (!systemIsExit)
-            //        {
-            //            havPermission = true;
-            //        }
-            //    }
-            //}
-
-
-
-            if (havPermission == false)
-            {
-                actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
-                                     new ApiResult
-                                     {
-                                         resultCode = (int)ResultCode.NoPermission,
-                                         message = "权限不足",
-                                         data = null
-                                     });
     }
-
-        }
-    }
-
 }
\ No newline at end of file

Mall.WebApi/Helper/TokenHelper.cs

+using JWT;
+using JWT.Serializers;
+using Mall.Common.API;
+using Mall.Common.Plugin;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Mall.WebApi.Helper
+{
+    /// <summary>
+    /// Token帮助类
+    /// </summary>
+    public class TokenHelper
+    {
+
+        /// <summary>
+        /// 生成Token
+        /// </summary>
+        /// <returns></returns>
+        public static string CreateToken()
+        {
+            return "";
+        }
+
+        /// <summary>
+        /// 解析Token
+        /// </summary>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        public static TokenUserInfo ParsingToken(string token)
+        {
+            TokenUserInfo tokenUser = new TokenUserInfo();
+            if (string.IsNullOrEmpty(token))
+            {
+                IJsonSerializer serializer = new JsonNetSerializer();
+                IDateTimeProvider provider = new UtcDateTimeProvider();
+                IJwtValidator validator = new JwtValidator(serializer, provider);
+                IBase64UrlEncoder urlEncoder = new JwtBase64UrlEncoder();
+                IJwtDecoder decoder = new JwtDecoder(serializer, validator, urlEncoder);
+                string secret = Common.Config.JwtSecretKey;
+                var json = decoder.Decode(token, secret, verify: true);//token为之前生成的字符串
+                if (!string.IsNullOrEmpty(json))
+                {
+                    JObject jwtJson = JObject.Parse(json);
+                    var mall_userInfo = JObject.Parse(jwtJson.GetStringValue("mall_userInfo"));
+                    tokenUser.requestFrom = (Common.Enum.ApiRequestFromEnum)mall_userInfo.GetInt("requestFrom");
+                    tokenUser.uid = mall_userInfo.GetStringValue("uid");
+                }
+            }
+            return tokenUser;
+        }
+    }
+}