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

Mall.Module.User/EmployeeModule.cs

@@ -245,12 +245,13 @@ namespace Mall.Module.User
         /// 删除员工
         /// </summary>
         /// <param name="EmpId"></param>
+        /// <param name="status">1-删除,0-恢复</param>
         /// <returns></returns>
-        public bool RemoveEmployeeModule(object EmpId)
+        public bool RemoveEmployeeModule(object EmpId,int status)
         {
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
-                { nameof(RB_Employee_Extend.Status),1},
+                { nameof(RB_Employee_Extend.Status),status},
             };
             bool flag = employeeRepository.Update(fileds, new WhereHelper(nameof(RB_Employee_Extend.EmpId), EmpId));
             return flag;

Mall.Repository/User/RB_EmployeeRepository.cs

@@ -23,7 +23,7 @@ namespace Mall.Repository.User
         public List<RB_Employee_Extend> GetEmployeePageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Employee_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT * FROM RB_Employee WHERE 1=1 AND Status=0 ");
+            builder.AppendFormat(@" SELECT * FROM RB_Employee WHERE 1=1 ");
             if (query.TenantId > 0)
             {
                 builder.AppendFormat(" AND {0}={1} ", nameof(RB_Employee_Extend.TenantId), query.TenantId);
@@ -40,7 +40,10 @@ namespace Mall.Repository.User
             {
                 builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Employee_Extend.EmpName), query.EmpName.Trim());
             }
-
+            if (query.Status >= 0)
+            {
+                builder.AppendFormat(" AND {0}={1} ", nameof(RB_Employee_Extend.Status), query.Status);
+            }
             return GetPage<RB_Employee_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
 

Mall.WebApi/Controllers/User/EmployeeController.cs

@@ -195,7 +195,8 @@ namespace Mall.WebApi.Controllers.User
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var EmpId = parms.GetInt("EmpId", 0);
-            var flag = module.RemoveEmployeeModule(EmpId);
+            int status = parms.GetInt("status", 0);
+            var flag = module.RemoveEmployeeModule(EmpId, status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion