页面修改

Mall.Repository/User/RB_TenantRepository.cs

@@ -56,20 +56,19 @@ namespace Mall.Repository.User
         /// <returns></returns>
         public RB_Tenant_Extend GetTenantByMallRepository(RB_Tenant_Extend query)
         {
-            StringBuilder builder = new StringBuilder();
-            builder.Append(@"
+            StringBuilder builder1 = new StringBuilder();
+            builder1.AppendFormat(@"
+SELECT A.TenantId,A.Account AS Account,A.Name,A.MobilePhone,A.WeChatNum,A.IsEffective,A.AccountValidate,A.CreateMiniPrograme
+        ,A.AccountStatus,A.`Password` AS Password,0 AS EmpId,0 AS MallBaseId
+FROM RB_Tenant AS A 
+WHERE 1=1 AND A.Account='{0}'
+UNION ALL
 SELECT A.TenantId,B.EmpAccount AS Account,A.Name,A.MobilePhone,A.WeChatNum,A.IsEffective,A.AccountValidate,A.CreateMiniPrograme
-        ,A.AccountStatus,B.EmpPwd AS Password,B.EmpId
+        ,A.AccountStatus,B.EmpPwd AS Password,B.EmpId,B.MallBaseId
 FROM RB_Tenant AS A  INNER JOIN rb_employee AS B ON A.TenantId=B.TenantId
-WHERE 1=1 ");
-            if (query != null)
-            {
-                if (query.Account != null && !string.IsNullOrEmpty(query.Account.Trim()))
-                {
-                    builder.AppendFormat(" AND B.EmpAccount='{0}' ", query.Account.Trim());
-                }
-            }
-            return Get<RB_Tenant_Extend>(builder.ToString()).FirstOrDefault();
+WHERE 1=1 AND B.EmpAccount='{0}'
+", query.Account.Trim());            
+            return Get<RB_Tenant_Extend>(builder1.ToString()).FirstOrDefault();
         }
 
         /// <summary>

Mall.WebApi/Controllers/User/TenantController.cs

@@ -89,16 +89,7 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult Login()
         {
             var query = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
-            var model = new RB_Tenant_Extend();
-            if (query.MallBaseId > 0)
-            {
-                model = TenantModule.GetTenantByMallModule(query);
-            }
-            else
-            {
-                model = TenantModule.GetTenantListModule(query).FirstOrDefault();
-            }
-
+            var model = TenantModule.GetTenantByMallModule(query);
             if (model == null)
             {
                 return ApiResult.Failed("未找到此用户");
@@ -131,7 +122,6 @@ namespace Mall.WebApi.Controllers.User
                             //再查询是否存在是否是账号登陆
                             erpUserInfo = authorizeModule.GetNewByAccountAndPwd(authorizeModel.Account, authorizeModel.Password, authorizeModel.ERPGroupId);
                         }
-
                         if (erpUserInfo != null && !string.IsNullOrWhiteSpace(erpUserInfo.EmLoginMobile) && erpUserInfo.IsLeave == 0)
                         {
                             TokenUserInfo erpUserInfoToken = new TokenUserInfo { uid = erpUserInfo.EmployeeId.ToString(), requestFrom = Common.Enum.ApiRequestFromEnum.ERP };
@@ -153,30 +143,10 @@ namespace Mall.WebApi.Controllers.User
                             string erpsecret = Config.JwtSecretKey;
                             erptoken = erpencoder.Encode(erppayload, erpsecret);
                             #endregion
-                            //ERPUserInfo erpObj = new ERPUserInfo
-                            //{
-
-                            //    Domain = authorizeModel.DomainName,
-                            //    emName = erpUserInfo.EmName,
-                            //    EmployeeId = erpUserInfo.EmployeeId,
-                            //    RB_Group_id = erpUserInfo.RB_Group_id,
-                            //    RB_Branch_id = erpUserInfo.RB_Branch_id,
-                            //    RB_Post_Id = erpUserInfo.RB_Post_Id,
-                            //    RB_Department_Id = erpUserInfo.RB_Department_Id,
-                            //    token = erptoken,
-                            //    SecretKey = erpUserInfo.SecretKey,
-                            //    //ImAccount = imAccount?.AccID ?? model.EmLoginMobile, //model.EmLoginMobile,
-                            //    //ImToken = IMService.DefaultPassword(),
-                            //};
-                            //UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.ERP_Login_Info_+ erpUserInfo.EmployeeId, erpObj, Config.JwtExpirTime);
                         }
                     }
-
                 }
                 #endregion
-
-
-
                 TokenUserInfo userInfo = new TokenUserInfo { uid = model.TenantId.ToString(), requestFrom = ApiRequestFromEnum.Web };
                 #region JWT
                 IDateTimeProvider provider = new UtcDateTimeProvider();
@@ -212,9 +182,9 @@ namespace Mall.WebApi.Controllers.User
                     MallBaseId = 0,
                     EmpId = model.EmpId,
                     erptoken = erptoken,
-                    ERPEmpId = erpUserInfo.EmployeeId,
-                    ERPBranchId = erpUserInfo.RB_Branch_id,
-                    ERPGroupId = erpUserInfo.RB_Group_id
+                    ERPEmpId = (erpUserInfo?.EmployeeId??0),
+                    ERPBranchId = (erpUserInfo?.RB_Branch_id??-1),
+                    ERPGroupId = (erpUserInfo?.RB_Group_id??0)
                 };
                 UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + model.TenantId, obj, Config.JwtExpirTime);
                 return ApiResult.Success("", obj);