diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dc60f4499..4884a3c33 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -175,6 +175,7 @@ class IssuesController < ApplicationController
             unless attachment.blank?
               attachment.container = @issue
               attachment.author_id = current_user.id
+              attachment.description = ""
               attachment.save
             end
           end
@@ -244,6 +245,7 @@ class IssuesController < ApplicationController
             unless attachment.blank?
               attachment.container = @issue
               attachment.author_id = current_user.id
+              attachment.description = ""
               attachment.save
             end
           end
diff --git a/public/react/src/forge/Order/Nav.js b/public/react/src/forge/Order/Nav.js
index 6afd7043e..af7072eef 100644
--- a/public/react/src/forge/Order/Nav.js
+++ b/public/react/src/forge/Order/Nav.js
@@ -6,7 +6,7 @@ class Nav extends Component{
     return(
       <p className="topWrapper_nav">
         <Link to={``} >标签</Link>
-        <Link to={``}>里程</Link>
+        <Link to={``}>里程碑</Link>
       </p>
     )
   }
diff --git a/public/react/src/forge/Order/New.js b/public/react/src/forge/Order/New.js
index 8ced05c0e..8f73e107d 100644
--- a/public/react/src/forge/Order/New.js
+++ b/public/react/src/forge/Order/New.js
@@ -75,7 +75,6 @@ class New extends Component{
       if(!err){
         const { projectsId } = this.props.match.params;
         const { fileList } = this.state;
-        const { current_user } = this.props;
         const url = `/projects/${projectsId}/issues.json`;
         axios.post(url,{
           ...values,
diff --git a/public/react/src/forge/Order/OrderItem.js b/public/react/src/forge/Order/OrderItem.js
index e69de29bb..6538d633e 100644
--- a/public/react/src/forge/Order/OrderItem.js
+++ b/public/react/src/forge/Order/OrderItem.js
@@ -0,0 +1,46 @@
+import React , { Component } from 'react';
+
+
+class OrderItem extends Component{
+  render(){
+    const { issues , search_count , page , limit } = this.props;
+    const renderList =()=>{
+      if(issues && issues.length > 0){
+        return(
+          issues.map((item,key)=>{
+            return(
+              <div className="issueItem">
+                <div className="flex-1">
+                  <p className="mb15 df">
+                    <span className="issueNo"># {search_count - (key + (page-1) * limit)}</span>
+                    <span className="flex-1 hide-1 font-16 color-grey-3 lineh-30">{item.name}</span>
+                  </p>
+                  <p className="color-grey-6">
+                    <span>{item.created_at}</span>
+                    { item.journals_count ? <span className="ml20"><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</span> : "" }
+                  </p>
+                </div>
+                <ul className="topWrapper_select">
+                  <li>{item.issue_tags || "--"}</li>
+                  <li>{item.issue_type || "--"}</li>
+                  <li>{item.tracker || "--"}</li>
+                  <li>{item.author_name || "--"}</li>
+                  <li>{item.assign_user_name || "--"}</li>
+                  <li>{item.priority || "--"}</li>
+                  <li>{item.done_ratio || "--"}</li>
+                </ul>
+              </div>
+            )
+          })
+        )
+      }
+    }
+    return(
+      <div>
+        {renderList()}
+      </div>
+    )
+  }
+}
+
+export default OrderItem;
\ No newline at end of file
diff --git a/public/react/src/forge/Order/order.js b/public/react/src/forge/Order/order.js
index 165c51198..d2e002916 100644
--- a/public/react/src/forge/Order/order.js
+++ b/public/react/src/forge/Order/order.js
@@ -1,19 +1,44 @@
 import React , { Component } from "react";
 import {Link} from 'react-router-dom';
-import { Input ,Dropdown , Menu , Icon } from 'antd';
+import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import './order.css';
 
+import NoneData from '../../modules/courses/coursesPublic/NoneData';
 import Nav from './Nav';
+import OrderItem from './OrderItem';
+
 
 import axios from 'axios';
 
 const Search = Input.Search;
-
+/**
+ * issue_chosen:下拉的筛选列表,
+ * data:列表接口返回的所有数据,
+ * issues:列表数组,
+ * isSpin:加载中,
+ * search:搜索关键字,
+ * author_id:发布者id,
+ * assigned_to_id:指派给。。。的id，
+ * limit:每页条数,
+ * page:当前页,
+ * search_count:列表总条数
+ * issue_type:搜索条件
+ */
 class order extends Component{
   constructor(props){
     super(props);
     this.state={
-      issue_chosen:undefined
+      issue_chosen:undefined,
+      data:undefined,
+      issues:undefined,
+      isSpin:false,
+      search:undefined,
+      author_id:undefined,
+      assigned_to_id:undefined,
+      limit:15,
+      page:1,
+      search_count:undefined,
+      issue_type:undefined
     }
   }
 
@@ -37,43 +62,120 @@ class order extends Component{
     })
   }
 
-  getIssueList=()=>{
+  // 获取列表数据
+  getIssueList=(page,limit,search,author_id,assigned_to_id,issue_type)=>{
     const { projectsId } = this.props.match.params;
 
     const url = `/projects/${projectsId}/issues.json`;
     axios.get(url,{
-      params:{}
+      params:{
+        page,limit,search,author_id,assigned_to_id,issue_type
+      }
     }).then((result)=>{
       if(result){
-
+        this.setState({
+          data:result.data,
+          issues:result.data.issues,
+          search_count:result.data.search_count,
+          isSpin:false
+        })
       }
     }).catch((error)=>{
       console.log(error);
     })
   }
 
-  getOption=(e)=>{
-    console.log(e);
+  getOption=(e,id)=>{
+    this.setState({
+      [id]:e.key
+    })
+    const { page,limit,search,author_id,assigned_to_id } = this.state;
+    this.getIssueList(page,limit,search,author_id,assigned_to_id,e.key);
   }
-  renderMenu =(array,name)=>{
+
+  renderMenu =(array,name,id)=>{
     return(
       <Menu>
-        <Menu.Item key="0" onClick={this.getOption}>{name}</Menu.Item>
+        <Menu.Item key="0" onClick={(e)=>this.getOption(e,id)}>{name}</Menu.Item>
         {
           array && array.length > 0 && array.map((item,key)=>{
             return(
-              <Menu.Item key={item.id} onClick={this.getOption}>{item.name}</Menu.Item>
+              <Menu.Item key={item.id} onClick={(e)=>this.getOption(e,id)}>{item.name}</Menu.Item>
             )
           })
         }
       </Menu>
     )
   }
+
+  // 翻页
+  ChangePage=(page)=>{
+    this.setState({
+      page,
+      isSpin:true
+    })
+    const {limit,search} =  this.state;
+    this.getIssueList(page,limit,search);
+  }
+
+  // 搜索
+  searchFunc=(value)=>{
+    this.setState({
+      search:value,
+      isSpin:true
+    })
+    const {page,limit} =  this.state;
+    this.getIssueList(page,limit,value);
+  }
+
+  // 筛选：全部、指派给我、由我创建
+  ChangeAssign=(type)=>{
+    const { limit, search} = this.state;
+    this.setState({
+      isSpin:true
+    })
+    if(type){
+      const { current_user } = this.props;
+      if(type===1){
+        this.setState({
+          page:1,
+          author_id:current_user.user_id,
+          assigned_to_id:undefined
+        })
+        this.getIssueList(1,limit,search,current_user.user_id,undefined);
+      }else{
+        this.setState({
+          page:1,
+          author_id:undefined,
+          assigned_to_id:current_user.user_id
+        })
+        this.getIssueList(1,limit,search,undefined,current_user.user_id);
+      }
+    }else{
+      this.setState({
+        page:1,
+        author_id:undefined,
+        assigned_to_id:undefined
+      })
+      this.getIssueList(1,limit,search,undefined,undefined);
+    }
+  }
+
   render(){
 
-    const { issue_chosen } = this.state;
+    const { issue_chosen , issues , limit , page , search_count , data , assigned_to_id , author_id , isSpin } = this.state;
     const { projectsId } = this.props.match.params;
 
+    const Paginations = (
+      <React.Fragment>
+        {
+          search_count > limit ?
+          <div className="mt30 mb50 edu-txt-center">
+            <Pagination simple defaultCurrent={page} total={search_count} pageSize={limit} onChange={this.ChangePage}></Pagination>
+          </div>:""
+        }
+      </React.Fragment>
+    )
     return(
       <div className="main">
         <div className="topWrapper">
@@ -82,86 +184,73 @@ class order extends Component{
         </div>
         <div className="topWrapper" style={{borderBottom:"none"}}>
           <p className="topWrapper_nav">
-            <span>2个开启中</span>
-            <span>100个已关闭</span>
+            <span>{data && data.open_count}个开启中</span>
+            <span>{data && data.close_count}个已关闭</span>
           </p>
           <div>
             <Search
               placeholder="搜索"
               enterButton
-              onSearch={value => console.log(value)}
+              onSearch={this.searchFunc}
               style={{ width: 300 }}
             />
           </div>
         </div>
-        <div className="f-wrap-between mb20">
-          <ul className="topWrapper_type">
-            <li className="active">全部</li>
-            <li>指派给我</li>
-            <li>由我创建</li>
-            <li>@我的</li>
-          </ul>
-          <ul className="topWrapper_select">
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag,'标签')} trigger={['click']} placement="bottomCenter">
-                <span>标签<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_type,'所有类型')} trigger={['click']} placement="bottomCenter">
-                <span>类型<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.tracker,'所有分类')} trigger={['click']} placement="bottomCenter">
-                <span>分类<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'发布人')} trigger={['click']} placement="bottomCenter">
-                <span>发布人<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'指派人')} trigger={['click']} placement="bottomCenter">
-                <span>指派人<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.priority,'优先度')} trigger={['click']} placement="bottomCenter">
-                <span>优先度<Icon type="caret-down"  className="ml5"/></span>
-              </Dropdown>
-            </li>
-            <li>
-              <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.done_ratio,'完成度')} trigger={['click']} placement="bottomCenter">
-                <span>完成度<Icon type="caret-down" className="ml5" /></span>
-              </Dropdown>
-            </li>
-          </ul>
-        </div>
-        <div>
-          <div className="issueItem">
-            <div className="flex-1">
-              <p className="mb15 df">
-                <span className="issueNo">#10</span>
-                <span className="flex-1 hide-1 font-16 color-grey-3 lineh-30">forge重构：issue列表issue列表issue列表issue列表</span>
-              </p>
-              <p className="color-grey-6">
-                <span>1小时前创建</span>
-                <span className="ml20"><i className="iconfont icon-pinglun1 mr3 font-16"></i>3</span>
-              </p>
-            </div>
+        <Spin spinning={isSpin}>
+          <div className="f-wrap-between mb20">
+            <ul className="topWrapper_type">
+              <li className={!author_id && !assigned_to_id ? "active":""} onClick={()=>this.ChangeAssign()}>全部</li>
+              <li className={author_id ? "active":""} onClick={()=>this.ChangeAssign(1)}>指派给我</li>
+              <li className={assigned_to_id ? "active":""} onClick={()=>this.ChangeAssign(2)}>由我创建</li>
+              {/* <li>@我的</li> */}
+            </ul>
             <ul className="topWrapper_select">
-              <li>release</li>
-              <li>普通</li>
-              <li>缺陷</li>
-              <li>猜猜</li>
-              <li>猜猜猜</li>
-              <li>高</li>
-              <li>0%</li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag,'标签','issue_tag_id')} trigger={['click']} placement="bottomCenter">
+                  <span>标签<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_type,'所有类型','issue_type')} trigger={['click']} placement="bottomCenter">
+                  <span>类型<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.tracker,'所有分类','tracker_id')} trigger={['click']} placement="bottomCenter">
+                  <span>分类<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'发布人','author_id')} trigger={['click']} placement="bottomCenter">
+                  <span>发布人<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'指派人','assigned_to_id')} trigger={['click']} placement="bottomCenter">
+                  <span>指派人<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.priority,'优先度','priority_id')} trigger={['click']} placement="bottomCenter">
+                  <span>优先度<Icon type="caret-down"  className="ml5"/></span>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.done_ratio,'完成度','done_ratio')} trigger={['click']} placement="bottomCenter">
+                  <span>完成度<Icon type="caret-down" className="ml5" /></span>
+                </Dropdown>
+              </li>
             </ul>
           </div>
-        </div>
+          {
+            search_count === 0 ?
+            <NoneData></NoneData>
+            :
+            <OrderItem issues={issues} search_count={search_count} page={page} limit={limit}></OrderItem>
+          }
+          { Paginations }
+        </Spin>
+        
     </div>
     )
   }
diff --git a/public/react/src/modules/courses/coursesPublic/NoneData.js b/public/react/src/modules/courses/coursesPublic/NoneData.js
index e039fd0d0..c29070e74 100644
--- a/public/react/src/modules/courses/coursesPublic/NoneData.js
+++ b/public/react/src/modules/courses/coursesPublic/NoneData.js
@@ -1,10 +1,9 @@
 import React, { Component } from 'react';
-import { getImageUrl , getUrl } from 'educoder';
+import { getUrl } from 'educoder';
 
 class NoneData extends Component{
-  constructor(props) {
-    super(props)
-  }
+  
+  
   render(){
     const { style } = this.props;
     return(