Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Property/RB_ERP_Authorize.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Property
+{
+    /// <summary>
+    /// 资产管理授权实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_ERP_Authorize
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 状态1待审核，2-已审核，3-已拒绝，4-已作废
+        /// </summary>
+
+        public int Status { get; set; }
+
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+
+        public int CreateBy { get; set; }
+
+
+        /// <summary>
+        /// 类型2-集团，1-员工
+        /// </summary>
+        public int Type { get; set; }
+
+
+        /// <summary>
+        /// 商城中的用户id
+        /// </summary>
+        public int MallUserId { get; set; }
+
+
+        /// <summary>
+        /// 域名
+        /// </summary>
+        public string DomainName { get; set; }
+
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string Account { get; set; }
+
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password { get; set; }
+
+
+        ///// <summary>
+        ///// erp账号id
+        ///// </summary>
+        //public int ERPUserId { get; set; }
+
+
+        /// <summary>
+        /// erp集团id
+        /// </summary>
+        public int ERPGroupId { get; set; }
+
+    }
+}

Mall.Model/Entity/Property/RB_Employee.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Property
+{
+    /// <summary>
+    /// erp员工实体 Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "UserConnection")]
+    public class RB_Employee
+    {
+        /// <summary>
+        /// 主键:员工编号
+        /// </summary>        
+        public int EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 员工姓名
+        /// </summary>    
+        public string EmName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 性别
+        /// </summary> 
+        public int EmSex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>  
+        public string EmCard
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 生日
+        /// </summary>     
+        public DateTime? EmBirthday
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 学历
+        /// </summary>   
+        public string EmEducation
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 入职时间
+        /// </summary>       
+        public DateTime? EmEntry
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 离职时间
+        /// </summary>        
+        public DateTime? EmLeave
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 地址
+        /// </summary>   
+        public string EmAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 手机号码
+        /// </summary>     
+        public string EmMobile
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string EmTel
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// QQ号码
+        /// </summary>     
+        public string EmQQ
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 头像
+        /// </summary>        
+        public string EmPhoto
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账号
+        /// </summary>        
+        //[RegularValidate("^1[34578]\\d{9}$", showMessage = "帐号必须为手机号")]
+        public string EmAccount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 密码
+        /// </summary>  
+        public string EmPassword
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 集团编号
+        /// </summary>        
+        public int RB_Group_id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分公司编号
+        /// </summary>        
+        public int RB_Branch_id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 部门编号
+        /// </summary>        
+        public int RB_Department_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 职务编号
+        /// </summary>        
+        public int RB_Post_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建人
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新时间
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 密钥
+        /// </summary>    
+        public string SecretKey
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否离职，0:否，1是
+        /// </summary>        
+        public int? IsLeave
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 用户登陆手机号
+        /// </summary>        
+        public string EmLoginMobile
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 年假剩余天数
+        /// </summary>
+        public double? AnnualLeaveDay { get; set; }
+
+        /// <summary>
+        /// 是否管理员  1是  2否
+        /// </summary>
+        public int? IsAdmin { get; set; }
+
+        /// <summary>
+        /// 员工类型 0:正式员工,1:临时员工（外聘导游）
+        /// </summary>
+        public int? EmployeeType { get; set; }
+
+        /// <summary>
+        /// 财务催审次数
+        /// </summary>
+        public int? FinancePushOnNum { get; set; }
+
+        /// <summary>
+        /// 是否发送工作日志  1是  0否
+        /// </summary>
+        public int SendWorkLog { get; set; }
+
+        /// <summary>
+        /// 年会备注
+        /// </summary>
+        public string AnnualLeaveRemark { get; set; }
+    }
+}

Mall.Model/Entity/Property/RB_Group.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Property
+{
+    /// <summary>
+    /// rb_group Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "UserConnection")]
+    public class RB_Group
+    {
+
+        /// <summary>
+        /// 主键
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 集团名称
+        /// </summary>     
+        public string GroupName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 域名
+        /// </summary>        
+        public string Domain
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 联系人
+        /// </summary>     
+        public string ContactPersion
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 联系电话(手机)
+        /// </summary>   
+        public string MobilePhone
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 座机
+        /// </summary>        
+        public string Tel
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 地址
+        /// </summary>        
+        public string Address
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>        
+        public string Remarks
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public Common.Enum.DateStateEnum? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建人变化
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新时间
+        /// </summary>        
+        public DateTime UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 出团通知名
+        /// </summary>        
+        public string NoticesName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 机场服务人员
+        /// </summary>       
+        public string AirportServicePerson
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 机场服务人员电话
+        /// </summary>      
+        public string AirportServicePhone
+        {
+            get;
+            set;
+        }
+        public string Aliases
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 版本id
+        /// </summary>        
+        public int? Versions_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 部门最大层级
+        /// </summary>
+        public int? MaxDepartmentTier { get; set; }
+        /// <summary>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+        /// <summary>
+        /// 绑定的管理员帐号
+        /// </summary>
+        public int? AdminAccount { get; set; }
+
+        /// <summary>
+        /// 绑定的管理员角色
+        /// </summary>
+        public int? AdminRole { get; set; }
+
+        /// <summary>
+        /// B2B域名
+        /// </summary>
+        public string B2BDomain { get; set; }
+
+        /// <summary>
+        /// 集团下账户数量
+        /// </summary>
+        public int? EmployeeNum { get; set; }
+
+        /// <summary>
+        /// 是否有同业网站(0-没有，1-有)
+        /// </summary>
+        public int IsOpenB2B { get; set; }
+
+        /// <summary>
+        /// 是否有直客网站(0-没有，1-有)
+        /// </summary>
+        public int IsOpenB2C { get; set; }
+
+        /// <summary>
+        /// 是否有行程特色(0-没有，1-有)
+        /// </summary>
+        public int IsOpenTripFeature { get; set; }
+
+        /// <summary>
+        /// 行程特色背景图片
+        /// </summary>
+        public string TripFeatureImg { get; set; }
+
+        /// <summary>
+        /// 集团公章图片地址
+        /// </summary>
+        public string ZhangImg { get; set; }
+
+        /// <summary>
+        /// 使用航班类型(0-系统默认航班,1-自定义航班信息)
+        /// </summary>
+        public int UseFlightType { get; set; }
+    }
+}

Mall.Model/Extend/Property/RB_ERP_Authorize_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.Property;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Property
+{
+    /// <summary>
+    /// 资产管理授权实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_ERP_Authorize_Extend : RB_ERP_Authorize
+    {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string EmpName { get; set; }
+    }
+}

Mall.Model/Extend/Property/RB_Employee_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.Property;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Property
+{
+    /// <summary>
+    /// Rb_employee Entity Model
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "UserConnection")]
+    public class RB_Employee_Extend : RB_Employee
+    {
+        /// <summary>
+        /// op提成  被驳回的订单
+        /// </summary>
+        public string IsFinanceRejectOrder { get; set; }
+        /// <summary>
+        /// op提成  是否由财务单据被驳回  1是  其他否
+        /// </summary>
+        public int? IsFinanceReject { get; set; }
+        /// <summary>
+        /// op提成  未收齐款的订单
+        /// </summary>
+        public string IsNotCollectOrder { get; set; }
+        /// <summary>
+        /// op提成  是否未收齐款  1是  其他否
+        /// </summary>
+        public int? IsNotCollectMoney { get; set; }
+        /// <summary>
+        /// 有效的离职月份
+        /// </summary>
+        public string LeaveMonth { get; set; }
+        /// <summary>
+        /// 是否是部门负责人  1是
+        /// </summary>
+        public int? IsDepartmentManager { get; set; }
+        /// <summary>
+        /// 人员id
+        /// </summary>
+        public string EmployeeIds { get; set; }
+        /// <summary>
+        /// 集团名称
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 公司id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 公司id
+        /// </summary>
+        public int? BranchId { get; set; }
+
+        /// <summary>
+        ///多个部门id
+        /// </summary>
+        public string DepartmentIds { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepartmentName { get; set; }
+
+        /// <summary>
+        /// 职务名称
+        /// </summary>
+        public string PostName { get; set; }
+        /// <summary>
+        /// 三方映射账号
+        /// </summary>
+        public string OpenAccount { get; set; }
+
+        /// <summary>
+        /// 部门名称Id
+        /// </summary>
+        public string DepartmentID { get; set; }
+
+        /// <summary>
+        /// 里程
+        /// </summary>
+        public double distance { get; set; }
+
+        /// <summary>
+        /// 【查询使用】
+        /// </summary>
+        public string EndDate { get; set; }
+
+        /// <summary>
+        ///【查询使用】
+        /// </summary>
+        public string StartDate { get; set; }
+
+
+        /// <summary>
+        /// 是否应用分区 1是  2否
+        /// </summary>
+        public int? IsUseSubarea { get; set; }
+
+        /// <summary>
+        /// 部门及下级ids
+        /// </summary>
+        public string Departments { get; set; }
+
+        /// <summary>
+        /// 岗位ids  2019-05-16 Add By:w
+        /// </summary>
+        public string PostIds { get; set; }
+
+        /// <summary>
+        /// 领队/导游id
+        /// </summary>
+        public int LeaderId { get; set; }
+
+
+        /// <summary>
+        ///周冠军次数
+        /// </summary>
+        public int WeekChampion { get; set; }
+
+
+        /// <summary>
+        /// 综合得分
+        /// </summary>
+        public int SumScore { get; set; }
+
+    }
+}

Mall.Model/Extend/Property/RB_Group_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.Property;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Property
+{
+
+    /// <summary>
+    /// Rb_group Entity Model
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "UserConnection")]
+    public class RB_Group_Extend : RB_Group
+    {
+        #region 扩展字段
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public string VersionsName { get; set; }
+        /// <summary>
+        /// 管理员帐号
+        /// </summary>
+        public string EmAccount { get; set; }
+
+        /// <summary>
+        /// 是否等于
+        /// </summary>
+        public int? IsEquit { get; set; }
+        #endregion
+    }
+}

Mall.Module.Property/AuthorizeModule.cs

+using Mall.Model.Entity.Property;
+using Mall.Model.Extend.Property;
+using Mall.Repository.Property;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Module.Property
+{
+    public class AuthorizeModule
+    {
+
+        /// <summary>
+        /// 授权仓储层
+        /// </summary>
+        private readonly RB_ERP_AuthorizeRepository authorizeRepository = new RB_ERP_AuthorizeRepository();
+        /// <summary>
+        /// erp用户仓储层
+        /// </summary>
+        private readonly Rb_employeeRepository employeeRepository = new Rb_employeeRepository();
+
+
+        /// <summary>
+        /// 集团仓储层
+        /// </summary>
+        private readonly Rb_Group_Repository groupRepository = new Rb_Group_Repository();
+
+
+        #region 用户/集团授权
+        /// <summary>
+        /// 授权分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_ERP_Authorize_Extend> GetAuthorizePageList(int pageIndex, int pageSize, out long rowCount, RB_ERP_Authorize_Extend query)
+        {
+            return authorizeRepository.GetAuthorizePageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+
+        /// <summary>
+        /// 授权列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_ERP_Authorize_Extend> GetAuthorizeList(RB_ERP_Authorize_Extend query)
+        {
+            return authorizeRepository.GetAuthorizeList(query);
+        }
+
+        public bool AddERPAuthorize(RB_ERP_Authorize model)
+        {
+            if (model.ID == 0)
+            {
+                return authorizeRepository.Insert(model);
+            }
+            return false;
+        }
+
+        #endregion
+
+
+
+        #region erp集团以及用户信息
+        /// <summary>
+        /// 根据where获取list
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Group_Extend> GetGroupList(RB_Group_Extend dmodel)
+        {
+            return groupRepository.GetList(dmodel);
+        }
+
+        /// <summary>
+        /// 验证erp账号是否存在
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Employee_Extend> ValidateAdmin(RB_Employee_Extend dmodel)
+        {
+            return employeeRepository.ValidateAdmin(dmodel);
+        }
+
+
+        #endregion
+
+    }
+}

Mall.Repository/Property/RB_ERP_AuthorizeRepository.cs

+using Mall.Model.Entity.Property;
+using Mall.Model.Extend.Property;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Property
+{
+    public class RB_ERP_AuthorizeRepository : RepositoryBase<RB_ERP_Authorize>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_ERP_Authorize); } }
+        /// <summary>
+        /// 授权分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_ERP_Authorize_Extend> GetAuthorizePageList(int pageIndex, int pageSize, out long rowCount, RB_ERP_Authorize_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.EmpName FROM {TableName} as a LEFT JOIN rb_employee as b on a.CreateBy=b.EmpId  WHERE  1=1");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.Status > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.Status)}={query.Status}");
+                }
+                if (query.Type > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.Type)}={query.Type}");
+                }
+            }
+            return GetPage<RB_ERP_Authorize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 授权列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_ERP_Authorize_Extend> GetAuthorizeList(RB_ERP_Authorize_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.EmpName FROM {TableName} as a LEFT JOIN rb_employee as b on a.CreateBy=b.EmpId  WHERE  1=1");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.ID)}={query.ID}");
+                }
+                if (query.Status > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.Status)}={query.Status}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+
+            }
+            return Get<RB_ERP_Authorize_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Property/Rb_Group_Repository.cs

+using Mall.Model.Entity.Property;
+using Mall.Model.Extend.Property;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Property
+{
+    /// <summary>
+    /// 集团扩展方法
+    /// </summary>
+    public partial class Rb_Group_Repository : RepositoryBase<RB_Group>
+    {
+        /// <summary>
+        /// 获取分页数据
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="dmodel"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_Group_Extend> GetPageList(int pageIndex, int pageSize, RB_Group_Extend dmodel, out long count)
+        {
+            string where = " WHERE 1=1 ";
+            if (!string.IsNullOrWhiteSpace(dmodel.GroupName))
+            {
+                where += " AND g." + nameof(RB_Group.GroupName) + " like '%" + dmodel.GroupName + "%'";
+            }
+            if (!string.IsNullOrWhiteSpace(dmodel.Domain))
+            {
+                where += " AND g." + nameof(RB_Group.Domain) + " like '%" + dmodel.Domain + "%'";
+            }
+            if (dmodel.Status.HasValue && dmodel.Status >= 0)
+            {
+                where += " AND g." + nameof(RB_Group.Status) + "=" + (int)dmodel.Status;
+            }
+            //where += string.Format(" ORDER BY g.{0} DESC ", nameof(Model.Entity.RB_Group.Id));
+            var pageList = GetPage<RB_Group_Extend>(pageIndex, pageSize, out count, "select g.*,v.VersionsName,e.EmAccount from Rb_group g left join rb_employee e on g.AdminAccount=e.EmployeeId Left join Rb_sys_versions v on g.Versions_Id=v.Id " + where + " order by g.Id desc").ToList();
+            return pageList;
+        }
+
+        /// <summary>
+        /// 根据where获取list
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Group_Extend> GetList(RB_Group_Extend dmodel)
+        {
+            string where = " WHERE 1=1";
+            if (dmodel.Id > 0)
+            {
+                where += " AND " + nameof(RB_Group_Extend.Id) + "=" + dmodel.Id;
+            }
+            if (dmodel.Status.HasValue)
+            {
+                where += " AND " + nameof(RB_Group_Extend.Status) + "=" + (int)dmodel.Status;
+            }
+            if (!string.IsNullOrWhiteSpace(dmodel.GroupName))
+            {
+                where += " AND " + nameof(RB_Group_Extend.GroupName) + " like '%" + dmodel.Status + "%'";
+            }
+
+            if (dmodel.IsEquit == 1)
+            {
+                if (!string.IsNullOrWhiteSpace(dmodel.Domain))
+                {
+                    where += " AND " + nameof(RB_Group_Extend.Domain) + " = '" + dmodel.Domain + "'";
+                }
+                if (!string.IsNullOrWhiteSpace(dmodel.B2BDomain))
+                {
+                    where += " AND " + nameof(RB_Group_Extend.B2BDomain) + " = '" + dmodel.B2BDomain + "'";
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrWhiteSpace(dmodel.Domain))
+                {
+                    where += " AND " + nameof(RB_Group_Extend.Domain) + " like '%" + dmodel.Domain + "%'";
+                }
+                if (!string.IsNullOrWhiteSpace(dmodel.B2BDomain))
+                {
+                    where += " AND " + nameof(RB_Group_Extend.B2BDomain) + " like '%" + dmodel.B2BDomain + "%'";
+                }
+            }
+            if (dmodel.Versions_Id.HasValue)
+            {
+                where += " AND " + nameof(RB_Group_Extend.Versions_Id) + "=" + dmodel.Versions_Id;
+            }
+
+            where += string.Format(" ORDER BY {0} DESC ", nameof(RB_Group.Id));
+            return Get<RB_Group_Extend>("select * from RB_Group " + where).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据where获取list
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Group_Extend> GetListByDomain(RB_Group_Extend dmodel)
+        {
+            string where = " WHERE 1=1";
+            if (dmodel.Status.HasValue)
+            {
+                where += " AND " + nameof(RB_Group_Extend.Status) + "=" + (int)dmodel.Status;
+            }
+            if (!string.IsNullOrWhiteSpace(dmodel.GroupName))
+            {
+                where += " AND " + nameof(RB_Group_Extend.GroupName) + " like '%" + dmodel.Status + "%'";
+            }
+            if (!string.IsNullOrWhiteSpace(dmodel.Domain))
+            {
+                where += " AND " + nameof(RB_Group_Extend.Domain) + " ='" + dmodel.Domain + "'";
+            }
+            if (!string.IsNullOrWhiteSpace(dmodel.B2BDomain))
+            {
+                where += " AND " + nameof(RB_Group_Extend.B2BDomain) + " ='" + dmodel.B2BDomain + "'";
+            }
+            if (dmodel.Versions_Id.HasValue)
+            {
+                where += " AND " + nameof(RB_Group_Extend.Versions_Id) + "=" + dmodel.Versions_Id;
+            }
+            where += string.Format(" ORDER BY {0} DESC ", nameof(RB_Group.Id));
+            return Get<RB_Group_Extend>("select * from RB_Group " + where).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Property/AuthorizeController.cs

+using System;
+using System.Linq;
+using Mall.Common.API;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Mall.Common;
+using Mall.Module.Property;
+using Mall.Model.Extend.Property;
+
+namespace Mall.WebApi.Controllers.Property
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class AuthorizeController : BaseController
+    {
+        private readonly AuthorizeModule authorizeModule = new AuthorizeModule();
+
+        /// <summary>
+        /// 获取人员授权分页信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAuthorizePageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_ERP_Authorize_Extend demodel = JsonConvert.DeserializeObject<RB_ERP_Authorize_Extend>(parms.msg.ToString());
+            demodel.Type = 1;
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = authorizeModule.GetAuthorizePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.Type,
+                x.Status,
+                x.TenantId,
+                x.MallBaseId,
+                x.CreateBy,
+                x.EmpName,
+                x.DomainName,
+                x.Account,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : "",
+                UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 获取集团授权信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAuthorizeModel()
+        {
+            var parms = RequestParm;
+            RB_ERP_Authorize_Extend demodel = JsonConvert.DeserializeObject<RB_ERP_Authorize_Extend>(parms.msg.ToString());
+            demodel.Type = 0;
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var authorizeModel = authorizeModule.GetAuthorizeList(demodel).FirstOrDefault();
+
+            return ApiResult.Success("", authorizeModel);
+        }
+
+
+
+
+
+        /// <summary>
+        /// 新增授权信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetAuthorize()
+        {
+            var parms = RequestParm;
+            RB_ERP_Authorize_Extend demodel = JsonConvert.DeserializeObject<RB_ERP_Authorize_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.CreateBy = UserInfo.EmpId;
+            demodel.CreateDate = System.DateTime.Now;
+            demodel.UpdateDate = System.DateTime.Now;
+            demodel.Status = 1;
+            if (string.IsNullOrWhiteSpace(demodel.DomainName))
+            {
+                return ApiResult.Failed("请填写需要绑定集团的域名");
+            }
+            if (demodel.Type == 1)
+            {
+                if (string.IsNullOrWhiteSpace(demodel.Account))
+                {
+                    return ApiResult.Failed("请填写需要绑定的账号");
+                }
+                if (string.IsNullOrWhiteSpace(demodel.Password))
+                {
+                    return ApiResult.Failed("请填写需要绑定的账户密码");
+                }
+            }
+
+            //判断集团域名是否存在
+            var groupModel = authorizeModule.GetGroupList(new RB_Group_Extend { Domain = demodel.DomainName, IsEquit = 1 }).FirstOrDefault();
+            if (groupModel == null || groupModel.Id == 0)
+            {
+                return ApiResult.Failed("集团域名不存在，请确认后再绑定");
+            }
+            demodel.ERPGroupId = groupModel.Id;
+            if (demodel.Type == 1)
+            {
+                //判断人员账号是否存在
+                demodel.Password = Common.DES.Encrypt(demodel.Password, Common.Config.WebApiKey, Common.Config.WebApiIV);
+                var employeeModel = authorizeModule.ValidateAdmin(new RB_Employee_Extend { RB_Group_id = groupModel.Id, EmAccount = demodel.Account, EmPassword = demodel.Password }).FirstOrDefault();
+                if (employeeModel == null || employeeModel.EmployeeId == 0)
+                {
+                    return ApiResult.Failed("账号不存在，请确认后再绑定");
+                }
+                if (employeeModel.IsLeave == 1)
+                {
+                    return ApiResult.Failed("账号已离职");
+                }
+            }
+            bool result = authorizeModule.AddERPAuthorize(demodel);
+
+            if (result)
+            {
+                return ApiResult.Success("申请绑定ERP信息，请等待审核");
+            }
+            else
+            {
+                return ApiResult.Failed("申请绑定ERP信息失败");
+
+            }
+        }
+
+
+
+    }
+
+}
\ No newline at end of file