Merge remote-tracking branch 'origin/master'

application/api/controller/Reviewer.php

@@ -2274,6 +2274,7 @@ class Reviewer extends Base
         //数据处理
         foreach ($aReviewerMajor as $key => $value) {
            $aReviewerMajor[$key]['major_title'] = getMajorStr($value['major_id']);
+           $aReviewerMajor[$key]['shu'] = getMajorShu($value['major_id']);
         }
         return json_encode(['status' => 1,'msg' => "Reviewer's field information is empty",'data' => $aReviewerMajor]);
     }
@@ -2313,12 +2314,10 @@ class Reviewer extends Base
                 $aAdd[] = ['major_id' => $value,'user_id' => $iUserId,'ctime' => time(),'state' => 0];
             }
             $result = Db::name('major_to_user')->insertAll($aAdd);
-            echo Db::getLastSql();
         }   
         if(!empty($aDelete)){//修改状态为1
             $aWhere = ['user_id' => $iUserId,'state' => 0,'major_id' => ['in',$aDelete]];
             $result = Db::name('major_to_user')->where($aWhere)->limit(count($aDelete))->update(['state' => 1,'ctime' => time()]);
-            echo Db::getLastSql();
         } 
         Db::commit();
         return json_encode(['status' => 1,'msg' => "Reviewer's field has been successfully modified"]);