Merge remote-tracking branch 'origin/dev' into rice

src/main/java/com/izouma/nineth/web/CompanyController.java

@@ -2,11 +2,11 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.Company;
 import com.izouma.nineth.domain.UserBalance;
-import com.izouma.nineth.repo.UserBalanceRepo;
-import com.izouma.nineth.service.CompanyService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CompanyRepo;
+import com.izouma.nineth.repo.UserBalanceRepo;
+import com.izouma.nineth.service.CompanyService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 
@@ -40,7 +39,7 @@ public class CompanyController extends BaseController {
         return companyRepo.save(record);
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasRole('ADMIN') || hasRole('META')")
     @PostMapping("/all")
     public Page<Company> all(@RequestBody PageQuery pageQuery) {
         return companyService.all(pageQuery);