1、征信失信js状态判断错误修复

2、预备人才弹框中全选bug修复

app/admin/controller/Talent.php

@@ -352,7 +352,7 @@ class Talent extends AdminController {
 
     public function selectNeedCheckData() {
         $params = $this->request->param();
-        return json(["code" => 200, "obj" => VerifyApi::getPublicList($params)]);
+        return json(["rows" => VerifyApi::getPublicList($params)]);
     }
 
     /**

app/common/api/VerifyApi.php

@@ -346,16 +346,17 @@ class VerifyApi {
                 break;
         }
         $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
-        $count = Talent::alias("ti")->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")->where($where)->count();
+        //$count = Talent::alias("ti")->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")->where($where)->count();
         $list = Talent::alias("ti")->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")
                         ->where($where)
                         ->limit($offset, $limit)
-                        ->order("ti.createTime " . $order)->field("ti.*,e.name as enterpriseName,e.type as enterprise_type,enterpriseTag")->select()->toArray();
+                        //->order("ti.createTime " . $order)
+                        ->field("ti.*,e.name as enterpriseName,e.type as enterprise_type,enterpriseTag")->select()->toArray();
         foreach ($list as &$item) {
             $item["talent_type"] = $item["enterprise_type"] == 1 ? "晋江市现代产业体系人才" : "集成电路优秀人才";
             $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
         }unset($item);
-        return ["total" => $count, "rows" => $list];
+        return $list;
     }
 
     public static function getListByIds($ids) {
@@ -1077,11 +1078,11 @@ class VerifyApi {
                         if ($log["active"] == 1) {
                             if ($log["new_state"] == 9) {
                                 $verifyDepts[$k] .= "（审核驳回）";
-                                $item["deptReject"]++;
+                                $item["deptReject"] ++;
                             }
                             if ($log["new_state"] == 12) {
                                 $verifyDepts[$k] .= "（审核通过）";
-                                $item["deptPass"]++;
+                                $item["deptPass"] ++;
                             }
                             $deptDescriptions[] = sprintf("%s：%s", $company["name"], $log["description"]);
                         } else {
@@ -1090,7 +1091,7 @@ class VerifyApi {
                                 continue;
                             }
                             $verifyDepts[$k] .= "（待审核）";
-                            $item["deptWait"]++;
+                            $item["deptWait"] ++;
                         }
                     }
                     $item["verifyDepts"] = implode(chr(10), $verifyDepts);

public/static/modular/talentIdentify/talentInfo/talentInfo_prepare.js

@@ -214,7 +214,7 @@ TalentInfo.showDataCheckModal = function (type) {
         pagination: true, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "client", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         pageNumber: 1, //初始化加载第一页，默认第一页
         pageSize: 10, //每页的记录行数（*）
         pageList: [10, 25, 50, 100, 500, 1000, 1500], //可供选择的每页的行数（*）
@@ -222,7 +222,7 @@ TalentInfo.showDataCheckModal = function (type) {
         showColumns: false,
         responseHandler: function (res) {
             $("#exportCommonModal").modal("show");
-            return res.obj;
+            return res.rows;
         },
         columns:
                 [
@@ -297,7 +297,7 @@ TalentInfo.hczxPass = function () {
  */
 TalentInfo.showHczxRejectModal = function () {
     if (this.check()) {
-        if (TalentInfo.seItem.checkState != 11) {
+        if (TalentInfo.seItem.checkState != 14) {
             Feng.info("当前记录不是待核查征信状态，无法核查");
             return;
         }