1

app/admin/view/user/add.html

@@ -30,7 +30,7 @@
                         <div class="col-sm-4 spacing">
                             <select class="form-control" id="type" name="type">
                                 <option value="">请选择</option>
-                                <option value="1">晋江市优秀人才</option>
+                                <option value="1">晋江市现代产业体系人才</option>
                                 <option value="2">集成电路优秀人才</option>
                                 <option value="3">海峡计划申报</option>
                                 <option value="4">super</option>

app/common/api/TalentConditionApi.php

@@ -70,9 +70,10 @@ class TalentConditionApi {
         if ($params["name"]) {
             $where[] = ["name", "like", "%" . $params["name"] . "%"];
         }
-        if ($params["type"]) {
-            $where[] = ["type", "=", $params["type"]];
-        }
+        /* if ($params["type"]) {
+          $where[] = ["type", "=", $params["type"]];
+          } */
+        $where[] = ["type", "=", session("user")["type"]];
         if ($params["talentLevel"]) {
             $where[] = ["talentLevel", "=", $params["talentLevel"]];
         }

app/common/api/VerifyApi.php

@@ -16,7 +16,7 @@ use app\common\model\TalentCondition;
  */
 class VerifyApi {
 
-    public static function getTalentInfoById($id,$isAdmin = false) {//添加admin只为区别导入数据管理端的显示差异
+    public static function getTalentInfoById($id, $isAdmin = false) {//添加admin只为区别导入数据管理端的显示差异
         $where = [];
         $where[] = ["id", "=", $id];
         $info = Talent::findOrEmpty($id)->toArray();
@@ -82,10 +82,10 @@ class VerifyApi {
                 if (strtotime($timeStart)) {
                     $tmp_time = date("Y-m-d", strtotime($timeStart));
                     $qz_talent_info[1] = implode("：", [$tmp1, $tmp_time]);
-                    if($isAdmin){
-                        $batch_info = NoticeModel::where('batch',$tmp_time)->find();
-                        if($batch_info){
-                            $qz_talent_info[1] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] ."'>".$qz_talent_info[1]."</a>";
+                    if ($isAdmin) {
+                        $batch_info = NoticeModel::where('batch', $tmp_time)->find();
+                        if ($batch_info) {
+                            $qz_talent_info[1] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] . "'>" . $qz_talent_info[1] . "</a>";
                         }
                     }
                 }
@@ -102,10 +102,10 @@ class VerifyApi {
                 if (strtotime($timeStart)) {
                     $tmp_time = date("Y-m-d", strtotime($timeStart));
                     $fj_talent_info[0] = implode("：", [$tmp1, $tmp_time]);
-                    if($isAdmin){
-                        $batch_info = NoticeModel::where('batch',$tmp_time)->find();
-                        if($batch_info){
-                            $fj_talent_info[0] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] ."'>".$fj_talent_info[0]."</a>";
+                    if ($isAdmin) {
+                        $batch_info = NoticeModel::where('batch', $tmp_time)->find();
+                        if ($batch_info) {
+                            $fj_talent_info[0] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] . "'>" . $fj_talent_info[0] . "</a>";
                         }
                     }
                     if (strtotime($validYear)) {
@@ -181,6 +181,7 @@ class VerifyApi {
         $offset = $params["offset"];
         $limit = $params["limit"];
         $where = [];
+        $where[] = ["e.type", "=", session("user")["type"]];
         if ($params["name"]) {
             $where[] = ["ti.name", "like", "%" . $params["name"] . "%"];
         }
@@ -237,6 +238,7 @@ class VerifyApi {
         unset($params["order"]);
         unset($params["limit"]);
         unset($params["offset"]);
+        $where[] = ["e.type", "=", session("user")["type"]];
         if ($params["name"]) {
             $where[] = ["ti.name", "like", "%{$params["name"]}%"];
         }
@@ -466,6 +468,7 @@ class VerifyApi {
         $study_abroad = [1 => "是", 2 => "否"];
 
         $where = [];
+        $where[] = ["e.type", "=", session("user")["type"]];
         switch ($process) {
             case 1:
                 $where = "ti.checkState in (" . TalentState::FST_SUBMIT . "," . TalentState::BASE_VERIFY_FAIL . ")";

app/enterprise/view/talent/view.html

@@ -125,7 +125,7 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
-                                                        <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}"  readonly disabled  id="sex"/>
+                                                        <input type="text" class="form-control" value="{eq name='row.sex' value='1'}男{else/}女{/eq}"  readonly disabled  id="sex"/>
                                                     </div>
                                                 </td>
                                                 <td>