app/views/educode_sales/staffs/index.json.jbuilder in educode_sales-0.5.1 vs app/views/educode_sales/staffs/index.json.jbuilder in educode_sales-0.5.2
- old
+ new
@@ -1,15 +1,25 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
json.data do
json.array! @staffs do |d|
json.id d.id
json.name d.user.real_name
json.role d.role&.name
- json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
json.job_type EducodeSales::Common.job_type_name[d.job_type]
json.month d.month
json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''
json.expired_at d.enabled_at ? "#{d.enabled_at.to_s(:date)}-#{d.expired_at.to_s(:date)}" : ''
+ if d.areas.present?
+ if d.areas.ids.sort.to_s == area_ids
+ json.area '全国'
+ else
+ json.area d.areas.pluck(:name).join("、")
+ end
+ else
+ json.area ''
+ end
end
end
+
json.code 0
json.count @staffs.total_count
\ No newline at end of file