Merge branch '201_zhouxin_issues' into 'master'

* Fix issue.

See merge request easycorp/zentaopms!3869

module/my/view/doc.html.php

@@ -36,6 +36,7 @@
     <table class='table table-fixed' id='docList'>
       <thead>
         <tr>
+          <th class="c-id"><?php echo $lang->doc->id;?></th>
           <th class="c-name"><?php echo $lang->doc->title;?></th>
           <th class="c-name c-object"><?php echo $lang->doc->object;?></th>
           <th class="c-num"><?php echo $lang->doc->size;?></th>
@@ -52,6 +53,7 @@
         <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
         <?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
         <tr>
+          <td class="c-id"><?php echo $doc->id;?></td>
           <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0&from={$lang->navGroup->doc}", '', true), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title='{$doc->title}' class='iframe' data-width='90%'");?></td>
           <td class='c-name'>
             <?php if(!empty($doc->objectType)):?>