diff --git a/AMESCoreStudio.Web/Controllers/SYSController.cs b/AMESCoreStudio.Web/Controllers/SYSController.cs
index 9e5c1c09..e5f425da 100644
--- a/AMESCoreStudio.Web/Controllers/SYSController.cs
+++ b/AMESCoreStudio.Web/Controllers/SYSController.cs
@@ -36,7 +36,8 @@ namespace AMESCoreStudio.Web.Controllers
             var SystemItems = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
-                SystemItems.Add(new SelectListItem(result[i].SystemNo + result[i].SystemName, result[i].SystemID.ToString()));
+                //SystemItems.Add(new SelectListItem(result[i].SystemNo + result[i].SystemName, result[i].SystemID.ToString()));
+                SystemItems.Add(new SelectListItem(result[i].SystemName, result[i].SystemID.ToString()));
             }
             ViewBag.SystemList = SystemItems;
         }
@@ -175,13 +176,14 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetSystemInfoesAsync()
+        public async Task<IActionResult> GetSystemInfoesAsync(int page = 1, int limit = 10)
         {
-            var result = await _sysApi.GetSystemInfoes();
+            var result = await _sysApi.GetSystemInfoes(page,limit);
+            var result_total = await _sysApi.GetSystemInfoes(0, limit);
 
             if (result.Count > 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count });
             }
 
             return Json(new Table() { count = 0, data = null });
@@ -191,8 +193,9 @@ namespace AMESCoreStudio.Web.Controllers
 
         #region SYS002模组资料维护相关
 
-        public IActionResult SYS002()
+        public async Task<IActionResult> SYS002()
         {
+            await GetSystemList();
             return View();
         }
 
@@ -278,6 +281,22 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetModuleInfoesBySystemAsync(int systemID, int page = 1, int limit = 10)
+        {
+            var result = await _sysApi.GetModuleInfoesBySystem(systemID, page, limit);
+            var result_total = await _sysApi.GetModuleInfoesBySystem(systemID, 0, limit);
+
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
         #endregion
 
         #region SYS003功能资料维护相关
diff --git a/AMESCoreStudio.Web/HttpApis/ISYS.cs b/AMESCoreStudio.Web/HttpApis/ISYS.cs
index db2f21cf..d660ba49 100644
--- a/AMESCoreStudio.Web/HttpApis/ISYS.cs
+++ b/AMESCoreStudio.Web/HttpApis/ISYS.cs
@@ -46,7 +46,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/SystemInfoes")]
-        ITask<List<SystemInfo>> GetSystemInfoes();
+        ITask<List<SystemInfo>> GetSystemInfoes(int page = 1, int limit = 10);
 
         #endregion
 
@@ -87,6 +87,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/ModuleInfoes")]
         ITask<List<ModuleInfo>> GetModuleInfoes();
 
+        /// <summary>
+        /// 根据系統獲取模組資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/ModuleInfoes/System/{id}")]
+        ITask<List<ModuleInfo>> GetModuleInfoesBySystem(int id, int page = 1, int limit = 10);
+
         #endregion
 
         #region SYS003功能資料維護相關 
diff --git a/AMESCoreStudio.Web/Views/SYS/SYS002.cshtml b/AMESCoreStudio.Web/Views/SYS/SYS002.cshtml
index 67af7b5c..f1f1640a 100644
--- a/AMESCoreStudio.Web/Views/SYS/SYS002.cshtml
+++ b/AMESCoreStudio.Web/Views/SYS/SYS002.cshtml
@@ -9,6 +9,22 @@
             <div class="layui-form-item ">
                 <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
             </div>
+            <div class="layui-form-item layui-layout-left">
+                <div class="layui-inline">
+                    <label class="layui-form-label">請選擇系統</label>
+                    <div class="layui-input-inline">
+                        <select id="system" lay-filter="system" lay-verify="required" lay-submit asp-items="@ViewBag.SystemList">
+                            <option value="0">全部</option>
+                        </select>
+                    </div>
+                    <input id="systemID" type="hidden" name="systemID" value="0" />
+                </div>
+                <div class="layui-inline layui-show-xs-block">
+                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
     <div class="layui-card-body">
@@ -18,6 +34,18 @@
 
 @section Scripts{
     <script type="text/javascript">
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+
+            form.on('select(system)', function (data) {
+                $("#systemID").val(data.value);
+
+                var qs = $('button[lay-filter="querysubmit"]');
+                qs.click();
+            });
+        });
+
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
             table && table.reload(data);
@@ -103,6 +131,6 @@
         }
         ];
         //基本数据表格
-        var table = hg.table.datatable('test', '模組資料管理', '/SYS/GetModuleInfoes', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('test', '模組資料管理', '/SYS/GetModuleInfoesBySystem/' + systemID.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }
\ No newline at end of file
diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs
index b0cc8d92..6ccc6b51 100644
--- a/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs
@@ -43,6 +43,55 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS
             //return await _context.ModuleInfoes.ToListAsync();
         }
 
+        /// <summary>
+        /// 根據流程ID獲取該流程站別資料
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        // GET: api/ModuleInfoes/System/5
+        [HttpGet("System/{id}")]
+        public async Task<ActionResult<IEnumerable<ModuleInfo>>> GetModuleInfoBySystem(int id, int page = 1, int limit = 10)
+        {
+            IQueryable<ModuleInfo> q = _context.ModuleInfoes;
+
+            if (id > 0)
+            {
+                q = q.Where(p => p.SystemID.Equals(id));
+            }
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.SortSeq).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.SortSeq);
+            }
+
+            try
+            {
+                var moduleInfo = await q.ToListAsync();
+
+                
+
+                if (moduleInfo == null)
+                {
+                    return NotFound();
+                }
+
+                return moduleInfo;
+            }
+            catch (Exception e1)
+            {
+                string msg = e1.Message;
+            }
+
+            return NotFound();
+
+
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs
index bb8149c3..0d44872c 100644
--- a/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs
@@ -29,14 +29,23 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS
         /// <summary>
         /// 獲取系統資料
         /// </summary>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
         /// <returns></returns>
         // GET: api/SystemInfoes
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<SystemInfo>>> GetSystemInfo()
+        public async Task<ActionResult<IEnumerable<SystemInfo>>> GetSystemInfo(int page = 1, int limit = 10)
         {
             IQueryable<SystemInfo> q = _context.SystemInfoes;
 
-            q = q.OrderBy(p => p.SystemID);
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.SystemID).Skip((page - 1) * limit).Take(limit); ;
+            }
+            else
+            {
+                q = q.OrderBy(p => p.SystemID);
+            }
 
             //q = q.OrderByDescending(p => p.SystemID);