修改员工密码格式验证

REBORN.CacheManager/User/RBUserCache.cs

@@ -158,7 +158,7 @@ namespace REBORN.CacheManager.User
                         ImAccount = model.EmLoginMobile,
                         B2BDomain = b2bDomain,
                         Domain = domain,
-                        IsExactness = ValidateHepler.IsPwd(EmPassword),
+                        IsExactness = true,//ValidateHepler.IsPwd(EmPassword),
                         SimpleEasy= gmodel.SimpleEasy,
                     };
                     try

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -33,6 +33,10 @@ namespace REBORN.Module.SellModule
     /// </summary>
     public class CustomerOrderModule
     {
+        /// <summary>
+        /// 其它单项服务合同
+        /// </summary>
+        private readonly RB_Travel_ContractRepository travel_ContractRepository = new RB_Travel_ContractRepository();
         /// <summary>
         /// 同业
         /// </summary>
@@ -1437,7 +1441,8 @@ namespace REBORN.Module.SellModule
                     appointOPList = appointOPRepository.GetList(new RB_Appoint_OP_Extend { QOrderIds = orderIds, ResourceType = ResourceTypeEnum.Hotel });
                 }
                 #endregion
-
+                //其它合同
+               // var otherContractList = travel_ContractRepository.GetTravelContractListRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
                 foreach (var item in list)
                 {
                     #region 查询订单对应的供应商以及指定op

REBORN.Services.PlatformService/BranchService.cs

@@ -142,20 +142,20 @@ namespace REBORN.Services.PlatformService
                 }
             }
 
-            int cityId = ConvertHelper.ToInt(demodel.City);
+            //int cityId = ConvertHelper.ToInt(demodel.City);
 
-            if (cityId <= 0)
-            {
-                return ApiResult.Failed("请选择城市！");
-            }
+            //if (cityId <= 0)
+            //{
+            //    return ApiResult.Failed("请选择城市！");
+            //}
             if (branchmodule.Exists(demodel.Id, demodel.BName, demodel.RB_Group_Id.Value))
             {
                 return ApiResult.Failed("公司名称重复！");
             }
-            if (branchmodule.ExistsExt(demodel))
-            {
-                return ApiResult.Failed("城市重复,请重新选择！");
-            }
+            //if (branchmodule.ExistsExt(demodel))
+            //{
+            //    return ApiResult.Failed("城市重复,请重新选择！");
+            //}
 
             //验证总公司唯一  并且  初始层级不能大于集团设置的最大层级
             if (demodel.BeginTier <= 0)

REBORN.Services.UserService/EmployeeService.cs

@@ -70,10 +70,10 @@ namespace REBORN.Services.UserService
                 {
                     return ApiResult.ParamIsNull("请输入密码！");
                 }
-                if (!ValidateHepler.IsPwd(model.EmPassword))
-                {
-                    return ApiResult.Failed("当前密码不符合规范请重新输入密码");
-                }
+                //if (!ValidateHepler.IsPwd(model.EmPassword))
+                //{
+                //    return ApiResult.Failed("当前密码不符合规范请重新输入密码");
+                //}
                 if (model.EmPassword.Length > 50)
                 {
                     return ApiResult.Failed("密码长度输入过长！");
@@ -546,10 +546,10 @@ namespace REBORN.Services.UserService
             {
                 return ApiResult.ParamIsNull();
             }
-            if (!ValidateHepler.IsPwd(Pwd))
-            {
-                return ApiResult.Failed("密码必须为大写字母+小写字母+数字或?!&$%#_，至少6位");
-            }
+            //if (!ValidateHepler.IsPwd(Pwd))
+            //{
+            //    return ApiResult.Failed("密码必须为大写字母+小写字母+数字或?!&$%#_，至少6位");
+            //}
             if (Pwd.Length > 50)
             {
                 return ApiResult.Failed("密码长度过长！");
@@ -1634,10 +1634,10 @@ namespace REBORN.Services.UserService
             {
                 return ApiResult.Failed("密码长度过长！");
             }
-            if (!ValidateHepler.IsPwd(Pwd))
-            {
-                return ApiResult.Failed("当前密码不符合规范请重新输入密码");
-            }
+            //if (!ValidateHepler.IsPwd(Pwd))
+            //{
+            //    return ApiResult.Failed("当前密码不符合规范请重新输入密码");
+            //}
             var emodel = employeemodule.Get(Id);
             if (emodel == null)
             {

REBORN.Services.UserService/LoginService.cs

@@ -115,7 +115,7 @@ namespace REBORN.Services.UserService
                     if (IsExactness)
                     {
                         string oldPass = Common.DES.Decrypt(EmPassword);
-                        IsExactness = ValidateHepler.IsPwd(oldPass);//不符合规范也强制修改密码
+                        IsExactness = true;//ValidateHepler.IsPwd(oldPass);//不符合规范也强制修改密码
                     }
                 }
                 string GroupName = gmodel != null ? gmodel.GroupName : "";
@@ -1242,10 +1242,10 @@ namespace REBORN.Services.UserService
                 return ApiResult.Failed("密码不能为空");
             }
 
-            if (!ValidateHepler.IsPwd(password))
-            {
-                return ApiResult.Failed("当前密码不符合规范请重新输入密码");
-            }
+            //if (!ValidateHepler.IsPwd(password))
+            //{
+            //    return ApiResult.Failed("当前密码不符合规范请重新输入密码");
+            //}
 
             RB_Employee emp = loginmodule.GetByLoginMobile(mobileNumber, groupId);
             if (emp != null)