Merge remote-tracking branch 'origin/master'

app/common/api/MenuApi.php

@@ -30,7 +30,19 @@ class MenuApi {
         $where[] = ["id", "in", $menu_ids];
         $whr[] = ["levels", "=", 1];
         $menus = Menu::whereOr([$where, $whr])->order("levels asc,num asc")->select()->toArray();
-        return self::buildMenu($menus);
+        $menus = self::buildMenu($menus);
+        $tmp = [];
+        for ($i = 0; $i < count($menus); $i++) {
+            $menu_items_count = count($menus[$i]["children"]);
+            $empty_url_count = 0;
+            for ($n = 0; $n < $menu_items_count; $n++) {
+                if ($menus[$i]["children"][$n]["new_url"] == null)
+                    $empty_url_count++;
+            }
+            if ($empty_url_count != $menu_items_count)
+                $tmp[] = $menus[$i];
+        }
+        return $tmp;
     }
 
     public static function getPrivilagesByRoleid($roleid) {

app/common/api/VerifyApi.php

@@ -308,6 +308,7 @@ class VerifyApi {
                     }
                     break;
                 case 5:
+                    $where[] = ["ti.checkState", ">=", 11];
                     if ($params["checkState"]) {
                         $where[] = ["ti.checkState", "=", $params["checkState"]];
                     }

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -840,9 +840,15 @@ TalentInfoInfoDlg.validateIsEdit = function () {
         if (checkState == 13) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
+        } else if (checkState == 28) {
+            Feng.error("申报已完成");
+            return false;
         } else if (checkState == 11) {
             Feng.error("您的申报已审核通过，无法再修改");
             return false;
+        } else if (checkState == 22 || checkState == 25 || checkState == 27) {
+            Feng.error("该申报已终止");
+            return false;
         } else {
             Feng.error("您的申报正在审核中，请耐心等待");
             return false;

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -792,9 +792,15 @@ TalentInfoInfoDlg.validateIsEdit = function () {
         if (checkState == 13) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
+        } else if (checkState == 28) {
+            Feng.error("申报已完成");
+            return false;
         } else if (checkState == 11) {
             Feng.error("您的申报已审核通过，无法再修改");
             return false;
+        } else if (checkState == 22 || checkState == 25 || checkState == 27) {
+            Feng.error("该申报已终止");
+            return false;
         } else {
             Feng.error("您的申报正在审核中，请耐心等待");
             return false;