sugangqiang 2 жил өмнө
parent
commit
ccffacf475

+ 2 - 2
app/common/controller/Api.php

@@ -200,9 +200,9 @@ class Api extends BaseController {
             }
         }
         if ($whr) {
-            $rows = Db::table("new_common_filetype")->whereOr([$where, $whr])->order("sn " . $order)->select()->toArray();
+            $rows = Db::table("new_common_filetype")->whereOr([$where, $whr])->order("must asc")->order("sn " . $order)->select()->toArray();
         } else {
-            $rows = Db::table("new_common_filetype")->where($where)->order("sn " . $order)->select()->toArray();
+            $rows = Db::table("new_common_filetype")->where($where)->order("must asc")->order("sn " . $order)->select()->toArray();
         }
         if ($id) {
             foreach ($rows as $key => $row) {

+ 1 - 1
app/enterprise/controller/Base.php

@@ -103,7 +103,7 @@ class Base extends EnterpriseController {
                 echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
                 exit;
             }
-            $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics", "experience", "education"];
+            $no_empty = ["name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics", "experience", "education"];
             if (in_array($ep["enterpriseTag"], ['mtdw', 'gyqyh', 'mbfqy', 'jrjg'])) {
                 $no_empty[] = "fst_work_time";
             }