子女就学++

app/common/api/TalentLogApi.php

@@ -170,7 +170,7 @@ class TalentLogApi {
         }
         $log["active"] = $active;
         $log["description"] = $description;
-        $log["createUser"] = $user ? sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]) : "系统";
+        $log["createUser"] = $user ? ($user["userType"] == 3 ? "申报用户" : sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"])) : "系统";
         $log["createTime"] = date("Y-m-d H:i:s");
         return TalentLog::create($log);
     }
@@ -189,7 +189,7 @@ class TalentLogApi {
         }
         $log["active"] = $active;
         $log["description"] = $description;
-        $log["updateUser"] = $user ? sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]) : "系统";
+        $log["updateUser"] = $user ? ($user["userType"] == 3 ? "申报用户" : sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"])) : "系统";
         $log["updateTime"] = date("Y-m-d H:i:s");
         return TalentLog::update($log);
     }

app/common/controller/Api.php

@@ -94,6 +94,7 @@ class Api extends BaseController {
             case 1:
                 $talentInfo = TalentApi::getOne($mainId);
                 $talent_condition = TalentConditionApi::getOne($talentInfo["talent_condition"]);
+            case 6:
             case 19:
             case 20:
                 $list = TalentLogApi::getList($type, $mainId);
@@ -119,6 +120,7 @@ class Api extends BaseController {
                 continue;
             $new_item["description"] = $item["description"];
             switch ($item['type']) {
+                case 6:
                 case 19:
                     $new_item["stateName"] = \app\common\state\LivingAllowanceState::getStepName($item["state"]);
                     $new_item["stepName"] = \app\common\state\LivingAllowanceState::getStepName($item["step"]);

app/person/controller/Education.php

@@ -158,6 +158,7 @@ class Education extends PersonController {
             $log["step"] = 0;
             $log["type"] = ProjectState::EDUCATION;
             $log["mainId"] = $data["id"];
+            $log["description"] = "";
             $log["createUser"] = "申报用户";
             $log["createTime"] = date("Y-m-d H:i:s");
             TalentLog::create($log);