From 7a560bc67c2de7c8caba4e965c8a0c573a8fe6c2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 7 Jan 2020 20:58:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20200107125721_migrate_zip_pack_column.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20200107125721_migrate_zip_pack_column.rb diff --git a/db/migrate/20200107125721_migrate_zip_pack_column.rb b/db/migrate/20200107125721_migrate_zip_pack_column.rb new file mode 100644 index 000000000..6beeb11d2 --- /dev/null +++ b/db/migrate/20200107125721_migrate_zip_pack_column.rb @@ -0,0 +1,5 @@ +class MigrateZipPackColumn < ActiveRecord::Migration[5.2] + def change + change_column :zip_packs, :pack_size, :float + end +end From b696363d9f948b8dbd1781a02079599a994bbe09 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 7 Jan 2020 21:09:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?json=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/graduation_tasks_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb index 38860d34c..dcb9a3bc3 100644 --- a/app/controllers/graduation_tasks_controller.rb +++ b/app/controllers/graduation_tasks_controller.rb @@ -216,6 +216,7 @@ class GraduationTasksController < ApplicationController tip_exception(403, "无权限访问") unless current_user.admin_or_business? _tasks_list + @work_list = @work_list.where("work_status > 0") person_list = @work_list.map do |work| o = {