取消人才申请中最高学历等3个相关字段的必填判定，修复企业端日志状态读取错误

app/admin/view/talent/talentInfo_common_check.html

@@ -331,7 +331,7 @@
                                         <tr>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
+                                                    <label class="control-label spacing td-label">最高学历</label>
                                                     <select class="form-control" id="highest_degree" name="highest_degree" value="{$info.highest_degree}">
                                                         <option value="" selected="true">{$info.highestDegreeName}</option>
                                                     </select>
@@ -339,13 +339,13 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                    <label class="control-label spacing td-label">毕业院校</label>
                                                     <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$info.graduate_school}">
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                    <label class="control-label spacing td-label">专业</label>
                                                     <input type="text" class="form-control" id="major" name="major" value="{$info.major}"/>
                                                 </div>
                                             </td>

app/enterprise/api/TalentApi.php

@@ -132,7 +132,7 @@ class TalentApi {
                 $list[$key]["enterpriseName"] = $enterprise["name"];
                 $list[$key]["industryName"] = $industries[$enterprise["industryFieldNew"]];
                 $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
-                $last_log = TalentLogApi::getLastLog($item["id"], 1);
+                $last_log = TalentLogApi::getLastLog($item["id"], 1, 0, ["active", "=", 1]);
                 $list[$key]["real_state"] = $last_log["state"];
                 $list[$key]["last_state"] = $last_log["last_state"];
             }

app/enterprise/controller/Talent.php

@@ -309,8 +309,8 @@ class Talent extends EnterpriseController {
             $field_dict = \app\common\api\DictApi::getTalentFields(4, $info["isImport"]);
 
             $no_empty = ["name", "nation", "card_type", "card_number", "sex", "birthday", "politics", "nationality", "province", "city", "talent_type", "experience", "education",
-                "talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "bank", "bank_number", "bank_branch_name",
-                "bank_account", "study_abroad", "phone", "email", "import_way", "cur_entry_time", "cur_entry_time", "position", "source"];
+                "talent_arrange", "talent_condition", "bank", "bank_number", "bank_branch_name",
+                "bank_account", "study_abroad", "phone", "email", "import_way", "cur_entry_time", "cur_entry_time", "position", "source"]; //"highest_degree", "graduate_school", "major",
 
             $where = [];
             $where[] = ["rel", "=", "study_abroad"];

app/enterprise/view/talent/apply.html

@@ -364,19 +364,19 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
+                                                        <label class="control-label spacing td-label">最高学历</label>
                                                         <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                        <label class="control-label spacing td-label">毕业院校</label>
                                                         <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                        <label class="control-label spacing td-label">专业</label>
                                                         <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
                                                     </div>
                                                 </td>

app/enterprise/view/talent/view.html

@@ -328,7 +328,7 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
+                                                        <label class="control-label spacing td-label">最高学历</label>
                                                         <select class="form-control" id="highest_degree">
                                                             <option value="">{$row.highestDegreeName}</option>
                                                         </select>
@@ -336,13 +336,13 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                        <label class="control-label spacing td-label">毕业院校</label>
                                                         <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                        <label class="control-label spacing td-label">专业</label>
                                                         <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
                                                     </div>
                                                 </td>

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

@@ -48,9 +48,9 @@ var TalentInfoInfoDlg = {
         source: {validators: {notEmpty: {message: '申报来源不能为空'}}},
         talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
         talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
-        highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
-        graduate_school: {validators: {notEmpty: {message: '毕业院校不能为空'}}},
-        major: {validators: {notEmpty: {message: '专业不能为空'}}},
+        //highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
+        //graduate_school: {validators: {notEmpty: {message: '毕业院校不能为空'}}},
+        //major: {validators: {notEmpty: {message: '专业不能为空'}}},
         bank: {
             validators: {
                 notEmpty: {