提交代码

Mall.Model/Entity/Property/RB_Supplies_WareHouse.cs

@@ -85,5 +85,15 @@ namespace Mall.Model.Entity.Property
             get;
             set;
         }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
     }
 }
\ No newline at end of file

Mall.Module.Property/AuthorizeModule.cs

 using Mall.Model.Entity.Property;
 using Mall.Model.Extend.Property;
+using Mall.Repository;
 using Mall.Repository.Property;
 using System;
 using System.Collections.Generic;
@@ -59,8 +60,23 @@ namespace Mall.Module.Property
             }
             else if (model.ID > 0)
             {
-                return authorizeRepository.Update(model);
-
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                              { nameof(RB_ERP_Authorize.Account),model.Account},
+                                { nameof(RB_ERP_Authorize.DomainName),model.DomainName},
+                           { nameof(RB_ERP_Authorize.UpdateDate),model.UpdateDate}
+                };
+                if (!string.IsNullOrWhiteSpace(model.Password))
+                {
+                    keyValues.Add(nameof(RB_ERP_Authorize.Password), model.Password);
+                }
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_ERP_Authorize.ID),
+                              FiledValue=model.ID,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                return authorizeRepository.Update(keyValues, wheres);
             }
             return false;
         }
@@ -123,7 +139,7 @@ namespace Mall.Module.Property
         {
             RB_Employee emp = employeeRepository.GetByAccount(account, RB_Group_id);
             //管理员密码
-            var adminPwd = Common.DES.Encrypt("Viitto!@#123", Common.Config.WebApiKey,Common.Config.WebApiIV);
+            var adminPwd = Common.DES.Encrypt("Viitto!@#123", Common.Config.WebApiKey, Common.Config.WebApiIV);
             if (emp != null && (emp.EmPassword.Equals(pwd) || pwd.Equals(adminPwd)))
             {
                 return emp;