卢江海代码更改

DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs

@@ -65,12 +65,25 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-        /// <summary>
-        /// 查询报工详情
-        /// </summary>
-        /// <param name="Id"></param>
-        /// <returns></returns>
-        [HttpGet("{Id}")]
+		/// <summary>
+		/// 查询工序列表
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost("baseworkprocesseslist")]
+		[ActionPermissionFilter(Permission = "proreportwork:baseworkprocesseslist")]
+		public IActionResult QueryBaseWorkProcesses()
+		{
+			
+			var response = _ProReportworkService.GetBaseWorkProcesses();
+			return SUCCESS(response);
+		}
+
+		/// <summary>
+		/// 查询报工详情
+		/// </summary>
+		/// <param name="Id"></param>
+		/// <returns></returns>
+		[HttpGet("{Id}")]
         [ActionPermissionFilter(Permission = "proreportwork:query")]
         public IActionResult GetProReportwork(string Id)
         {

DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -37,11 +37,24 @@ namespace DOAN.Admin.WebApi.Controllers.System
             this.hostEnvironment = hostEnvironment;
         }
 
-        /// <summary>
-        /// 个人中心用户信息获取
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
+		/// <summary>
+		/// 获取全部用户
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost("list")]
+		[ActionPermissionFilter(Permission = "list")]
+		public IActionResult QuerySysUser()
+		{
+
+			var response = UserService.GetSysUser();
+			return SUCCESS(response);
+		}
+
+		/// <summary>
+		/// 个人中心用户信息获取
+		/// </summary>
+		/// <returns></returns>
+		[HttpGet]
         public IActionResult Profile()
         {
             long userId = HttpContext.GetUId();
@@ -55,6 +68,9 @@ namespace DOAN.Admin.WebApi.Controllers.System
             return SUCCESS(new { user, roles, postGroup }, TIME_FORMAT_FULL);
         }
 
+
+
+
         /// <summary>
         /// 修改用户
         /// </summary>