1

app/admin/controller/TalentTypeChange.php

@@ -88,7 +88,7 @@ class TalentTypeChange extends AdminController {
                 $where[] = ["checkState", "not in", [3, 5]];
                 break;
             case 2:
-                $where[] = ["ttc.type", "=", $this->user["type"]];
+                //$where[] = ["ttc.type", "=", $this->user["type"]];
                 $companyId = $this->user["companyId"];
                 $where[] = ["td.companyId", "=", $companyId];
                 $where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
@@ -133,7 +133,10 @@ class TalentTypeChange extends AdminController {
         }
         foreach ($list as $key => $item) {
             if ($item["beforeCheckCompany"]) {
-                $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"]);
+                $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"], "name");
+            }
+            if ($item["companyId"]) {
+                $list[$key]["companyName"] = getCacheById("Company", $item["companyId"], "name");
             }
             $list[$key]["oldTalentArrangeName"] = $levelMap[$item["oldTalentArrange"]];
             $list[$key]["newTalentArrangeName"] = $levelMap[$item["newTalentArrange"]];

public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange_info.js

@@ -378,7 +378,7 @@ TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
                 }
             }
         }();
-    } else if (type == 5 || type == 6) {
+    } else if (type == 6) {
         $("#" + conditionElem).html("<option value=''>---请选择---</option>");
         var level = $("#" + arrangeElem).val();
         Feng.addAjaxSelect({
@@ -395,7 +395,7 @@ TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
             "displayCode": "id",
             "displayName": "name",
             "type": "GET",
-            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/showAll/1"
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + (!isNew ? "/showAll/1" : "")
         });
     }
     $("#" + conditionElem).trigger("chosen:updated");
@@ -429,7 +429,7 @@ TalentTypeChangeInfoDlg.getIdentifyCondition = function (isNew) {
             "displayCode": "id",
             "displayName": "name",
             "type": "GET",
-            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/showAll/1"
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
         });
         $("#newIdentifyCondition").trigger('chosen:updated');
     } else {