diff --git a/app/admin/controller/HonoraryAchievement/JointAchievement.php b/app/admin/controller/HonoraryAchievement/JointAchievement.php index b079866..98ff645 100644 --- a/app/admin/controller/HonoraryAchievement/JointAchievement.php +++ b/app/admin/controller/HonoraryAchievement/JointAchievement.php @@ -116,7 +116,6 @@ class JointAchievement extends BaseController 'joint_achievement_guid' => explode(',', $params['joint_achievement_guid']) ])->select(); $joint_achievement->delete(); - return msg('删除成功!'); Db::commit(); return msg('删除成功!'); } catch (\Throwable $th) { diff --git a/app/api/controller/HonoraryAchievement/Achievement.php b/app/api/controller/HonoraryAchievement/Achievement.php index 12d11c0..89969ea 100644 --- a/app/api/controller/HonoraryAchievement/Achievement.php +++ b/app/api/controller/HonoraryAchievement/Achievement.php @@ -24,16 +24,17 @@ class Achievement extends BaseController { $params = $request->param(); $con = []; - $this->validate($params, [ - 'school_category_id|录取院校类型id' => 'require', - ]); + // $this->validate($params, [ + // 'school_category_id|录取院校类型id' => 'require', + // ]); - $con = Tool::getOptionalQuery(['b.school_category_id', '=']); + // $con = Tool::getOptionalQuery(['b.school_category_id', '=']); $query = ModelAchievement::where($con) ->field([ 'a.achievement_id', 'a.school_category_guid', + 'b.school_category_id', 'b.school_category_name', 'a.achievement_title', 'a.achievement_content', diff --git a/app/api/controller/HonoraryAchievement/JointAchievement.php b/app/api/controller/HonoraryAchievement/JointAchievement.php index 1a316e7..63de3b3 100644 --- a/app/api/controller/HonoraryAchievement/JointAchievement.php +++ b/app/api/controller/HonoraryAchievement/JointAchievement.php @@ -51,7 +51,8 @@ class JointAchievement extends BaseController 'joint_achievement_title', 'joint_achievement_cover', 'joint_achievement_sort', - 'joint_achievement_content' + 'joint_achievement_content', + 'joint_achievement_create_time', ]) ->where('joint_achievement_id', $params['joint_achievement_id']) ->find(); diff --git a/app/api/controller/HonoraryAchievement/SchoolLeaders.php b/app/api/controller/HonoraryAchievement/SchoolLeaders.php index 5efd11e..df7885a 100644 --- a/app/api/controller/HonoraryAchievement/SchoolLeaders.php +++ b/app/api/controller/HonoraryAchievement/SchoolLeaders.php @@ -25,15 +25,16 @@ class SchoolLeaders extends BaseController $params = $request->param(); $con = []; - $this->validate($params, [ - 'school_category_id|录取院校类型id' => 'require', - ]); - $con = Tool::getOptionalQuery(['b.school_category_id', '=']); + // $this->validate($params, [ + // 'school_category_id|录取院校类型id' => 'require', + // ]); + // $con = Tool::getOptionalQuery(['b.school_category_id', '=']); $query = ModelSchoolLeaders::where($con) ->field([ 'a.school_leaders_id', 'a.school_category_guid', + 'b.school_category_id', 'b.school_category_name', 'a.school_leaders_name', 'a.school_leaders_school',