sugangqiang hace 2 años
padre
commit
2d3c882659

+ 1 - 1
app/common/api/ChuanglanSmsApi.php

@@ -28,7 +28,7 @@ class ChuanglanSmsApi {
             'phone' => $mobile,
             'report' => $needstatus,
         );
-        $deny_list = ["jjrcw.test"]; //拒绝短信名单
+        $deny_list = ["jjrcw.test", "jjrcw.test:8080"]; //拒绝短信名单
         if (in_array($_SERVER["HTTP_HOST"], $deny_list))
             return false; //测试不发送信息
         $result = $this->curlPost(self::API_SEND_URL, $postArr);

+ 1 - 1
app/common/api/DictApi.php

@@ -279,7 +279,7 @@ class DictApi {
                 }
                 break;
             case 3:
-                $str = '<span class="label">待提交认定材料</span>';
+                $str = '<span class="label label-primary">基审通过</span>';
                 break;
             case 4:
                 $str = '<span class="label">再提交基础信息</span>';

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

@@ -148,7 +148,7 @@ class Api extends BaseController {
                         $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
                     } else if (in_array($item["state"], [TalentState::ZX_PASS, TalentState::ANNOUNCED, TalentState::ANNOUNCED_REVERIFY_PASS, TalentState::PUBLISH_PASS, TalentState::CERTIFICATED])) {
                         $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
-                    } else if (in_array($item["state"], [TalentState::FST_SAVE])) {
+                    } else if (in_array($item["state"], [TalentState::FST_SAVE, TalentState::SCND_SAVE])) {
                         $new_item["stateName"] = '<span class="label">保存未提交</span>';
                     } else if ($item["state"] == 0) {
                         $new_item["stateName"] = '<span class="label">添加附件</span>';

+ 7 - 5
app/enterprise/controller/Base.php

@@ -218,12 +218,14 @@ class Base extends EnterpriseController {
             $where[] = ["active", "=", 1];
             $where[] = ["delete", "=", 0];
             $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
-            
-            $birthday = $param["birthday"];
-            $birthdayYear = substr($birthday, 0, 4);
-            $currentYear = date("Y");
-            $age = $currentYear - $birthdayYear;
 
+            $age = 0;
+            if ($param["birthday"]) {
+                $birthday = $param["birthday"];
+                $birthdayYear = substr($birthday, 0, 4);
+                $currentYear = date("Y");
+                $age = $currentYear - $birthdayYear;
+            }
             $ft_ids = [];
             $deletes = [];
             foreach ($filetypes as $ft) {