From d8b2244b9cc0b93dd2ca5eefb724e380ca4f336a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 29 May 2020 17:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=9A=E9=80=89=E6=9D=83?=
 =?UTF-8?q?=E9=99=90-=E5=BF=85=E9=A1=BB=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Order/index.scss |  1 +
 src/forge/Order/order.css  |  2 +-
 src/forge/Order/order.js   | 21 +++++++++------------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss
index f6b760b6a..d74e1d1bb 100644
--- a/src/forge/Order/index.scss
+++ b/src/forge/Order/index.scss
@@ -1,6 +1,7 @@
 .screenWrap{
   background:rgba(250,250,250,1);
   border:1px solid rgba(221,221,221,1);
+  padding-left: 20px;
 }
 
 .searchBanner{
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 5f2a45fd6..48403fe64 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -206,7 +206,7 @@
   flex-wrap: wrap;
   align-content: center;
   border-bottom:1px dashed #cecdcd;
-  padding:16px 0px;
+  padding:16px 0px 16px 20px;
 }
 .issueNo{
   padding:0px 5px;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 77e9dbec6..674fe8eaf 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -180,16 +180,9 @@ class order extends Component {
     select_params.page = 1;
 
     if (current_user) {
-      if (select_params.author_id && select_params.author_id === current_user.user_id) {
-        author_id = current_user.user_id;
-      } else {
-        author_id = undefined;
-      }
-      if (select_params.assigned_to_id && select_params.assigned_to_id === current_user.user_id) {
-        assigned_to_id = current_user.user_id;
-      } else {
-        assigned_to_id = undefined;
-      }
+      author_id = (select_params.author_id && select_params.author_id === current_user.user_id) ? current_user.user_id : undefined;
+      
+      assigned_to_id = (select_params.assigned_to_id && select_params.assigned_to_id === current_user.user_id) ? current_user.user_id : undefined;
     }
 
     this.setState({
@@ -561,7 +554,11 @@ class order extends Component {
         <Spin spinning={isSpin}>
           <div className="f-wrap-between screenWrap">
             <div className="df">
-              <Checkbox value="0" style={{ lineHeight: "50px", margin: "0px 15px 0px 20px" }} checked={all} onChange={this.changeAll}></Checkbox>
+              {
+                current_user ?
+                  <Checkbox value="0" style={{ lineHeight: "50px", marginRight: "15px" }} checked={all} onChange={this.changeAll}></Checkbox>
+                :""
+              }
               {checkedValue && checkedValue.length > 0 ?
                 <span style={{ lineHeight: "50px" }}>选中{checkedValue.length}个issue</span>
                 :
@@ -803,7 +800,7 @@ class order extends Component {
                       <OrderItem
                         key={key}
                         item={item}
-                        checkbox={<Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 20px' }}></Checkbox>}
+                        checkbox={current_user ? <Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 0px' }}></Checkbox>:""}
                         search_count={search_count}
                         page={select_params.page}
                         limit={select_params.limit}