sugangqiang 2 년 전
부모
커밋
f5b17810bd
2개의 변경된 파일12개의 추가작업 그리고 11개의 파일을 삭제
  1. 6 4
      app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html
  2. 6 7
      app/common/controller/Api.php

+ 6 - 4
app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -211,14 +211,16 @@
                 <table id="table" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;"
                        data-mobile-responsive="true" data-click-to-select="true">
                     <thead>
-                    <tr>
-                        <th data-field="selectItem" data-checkbox="true"></th>
-                    </tr>
+                        <tr>
+                            <th data-field="selectItem" data-checkbox="true"></th>
+                        </tr>
                     </thead>
                 </table>
             </div>
         </div>
     </div>
 </div>
-<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js?v=5"></script>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
 {/block}

+ 6 - 7
app/common/controller/Api.php

@@ -102,13 +102,12 @@ class Api extends BaseController {
                 if ($enterpriseId) {
                     $where[] = ["mainId", "=", $enterpriseId];
                     $ids = \app\enterprise\model\EnterpriseRecord::where($where)->column("id");
-                    if ($ids) {
-                        $where = [];
-                        $where[] = ["type", "=", $type];
-                        $where[] = ["active", "=", 1];
-                        $where[] = ["mainId", "in", $ids];
-                        $list = TalentChecklog::where($where)->order("createTime desc")->select();
-                    }
+                    $ids[] = $enterpriseId;
+                    $where = [];
+                    $where[] = ["type", "=", $type];
+                    $where[] = ["active", "=", 1];
+                    $where[] = ["mainId", "in", $ids];
+                    $list = TalentChecklog::where($where)->order("createTime desc")->select();
                 } else {
                     $list = TalentLogApi::getList($type, $mainId);
                 }