Merge remote-tracking branch 'origin/master'

app/admin/controller/Talent.php

@@ -35,12 +35,12 @@ class Talent extends AdminController {
         $params = $request->param();
         $id = $params["id"];
         $info = VerifyApi::getTalentInfoById($id, true);
-        $force = intval($this->request['force'],0);
-        $api_data = ApiData::where('uid','=',$info['card_number'])->where('action', '=', 'rending')->where('status','=',1)->find();//
-        if($force || !$api_data || !$api_data['status']){
-            ApiData::where('uid','=',$info['card_number'])->where('action', '=', 'rending')->where('status','=',1)->update(['status' => 0,'updateTime' => time()]);
+        $force = intval($this->request['force'], 0);
+        $api_data = ApiData::where('uid', '=', $info['card_number'])->where('action', '=', 'rending')->where('status', '=', 1)->find(); //
+        if ($force || !$api_data || !$api_data['status']) {
+            ApiData::where('uid', '=', $info['card_number'])->where('action', '=', 'rending')->where('status', '=', 1)->update(['status' => 0, 'updateTime' => time()]);
             $rsapi = new RsApi();
-            if($info['card_type'] == 1){
+            if ($info['card_type'] == 1) {
                 $content = [];
                 $info['rs']['I010902'] = $content['I010902'] = $rsapi->I010902($info['card_number']);
                 $info['rs']['I030101'] = $content['I030101'] = $rsapi->I030101($info['card_number']);
@@ -52,7 +52,7 @@ class Talent extends AdminController {
                 ];
                 ApiData::create($api_model_data);
             }
-        }else{
+        } else {
             $content = unserialize($api_data['content']);
             $info['rs'] = $content;
         }
@@ -931,7 +931,7 @@ class Talent extends AdminController {
         $data["checkState"] = $log["new_state"];
         TalentModel::update($data);
         TalentLogApi::setActive($log["id"], 1);
-        $this->sendMsgByState($talent_info, $log["state"], $userIds);
+        $this->sendMsgByState($talent_info, $log["state"], $userIds, $log["description"]);
         return json(["code" => 200, "msg" => "审核成功"]);
     }
 
@@ -1089,7 +1089,7 @@ class Talent extends AdminController {
                   $where[] = ["roleid", "<>", 1];
                   $userIds = User::where($where)->column("id"); */
 
-                $this->sendMsgByState($talent_info, $log_checkState, $userIds);
+                $this->sendMsgByState($talent_info, $log_checkState, $userIds, $dept_log["description"]);
             }
         }
         TalentLogApi::setActive($dept_log["id"], 1);
@@ -1188,11 +1188,11 @@ class Talent extends AdminController {
               $where[] = ["roleid", "<>", 1];
               $userIds = User::where($where)->column("id"); */
         }
-        $this->sendMsgByState($talent_info, $log["state"], $userIds);
+        $this->sendMsgByState($talent_info, $log["state"], $userIds, $log["description"]);
         return json(["code" => 200, "msg" => "审核成功"]);
     }
 
-    private function sendMsgByState($talent_info, $state, $userIds = []) {
+    private function sendMsgByState($talent_info, $state, $userIds = [], $description = "") {
         $phones = [];
         $template = "";
         $type = 0;
@@ -1208,12 +1208,12 @@ class Talent extends AdminController {
             case TalentState::BASE_REJECT://基础信息审核驳回发送短信通知用户
                 $type = 2;
                 $processName = "基础信息审核";
-                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核驳回，原因是：{$log['description']}，请及时登录申报系统修改并重新提交。";
+                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核驳回，原因是：{$description}，请及时登录申报系统修改并重新提交。";
                 break;
             case TalentState::BASE_VERIFY_FAIL://基础信息审核不通过发送短信通知用户
                 $type = 2;
                 $processName = "基础信息审核";
-                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核不通过，原因是：{$log['description']}。";
+                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核不通过，原因是：{$description}。";
                 break;
             case TalentState::FST_VERIFY_PASS://初审通过发送短信通知并审部门
                 $type = 1;
@@ -1223,17 +1223,17 @@ class Talent extends AdminController {
             case TalentState::FST_VERIFY_REJECT; //初审驳回发送短信通知用户
                 $type = 2;
                 $processName = "初级审核";
-                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才认定申报审核驳回，原因是：{$log['description']}，请及时登录申报系统修改并重新提交。";
+                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才认定申报审核驳回，原因是：{$description}，请及时登录申报系统修改并重新提交。";
                 break;
             case TalentState::FST_VERIFY_FAIL://初审不通过发送短信通知用户
                 $type = 2;
                 $processName = "初级审核";
-                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才认定申报审核不通过，原因是：{$log['description']}。";
+                $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才认定申报审核不通过，原因是：{$description}。";
                 break;
             case TalentState::DEPT_VERIFY_REJECT://并审驳回发送短信通知初审部门
                 $type = 1;
                 $processName = "部门并审";
-                $template = "【晋江市人才服务平台】有人才认定申报在并审阶段被驳回，原因是：{$log['description']}，请及时登录审批系统处理。";
+                $template = "【晋江市人才服务平台】有人才认定申报在并审阶段被驳回，原因是：{$description}，请及时登录审批系统处理。";
                 break;
             case TalentState::REVERIFY_PASS://复核通过发短信通知征信部门
                 $type = 1;
@@ -1243,7 +1243,7 @@ class Talent extends AdminController {
             case TalentState::REVERIFY_REJECT://复核驳回发短信通知初审部门
                 $type = 1;
                 $processName = "复审";
-                $template = "【晋江市人才服务平台】有人才认定申报在复审阶段被驳回，原因是：{$log['description']}，请及时登录审批系统处理。";
+                $template = "【晋江市人才服务平台】有人才认定申报在复审阶段被驳回，原因是：{$description}，请及时登录审批系统处理。";
                 break;
         }
         if ($type == 1) {