Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/service/UserService.java

@@ -112,7 +112,7 @@ public class UserService {
     private RockRecordRepo                rockRecordRepo;
 
     public User update(User user) {
-        if (!SecurityUtils.hasRole(AuthorityName.ROLE_ADMIN)) {
+        if (!SecurityUtils.hasRole(AuthorityName.ROLE_ADMIN) & !SecurityUtils.hasRole(AuthorityName.ROLE_SAAS)) {
             if (!SecurityUtils.getAuthenticatedUser().getId().equals(user.getId())) {
                 throw new BusinessException("无权限");
             }

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

@@ -109,6 +109,12 @@ public class MintOrderController extends BaseController {
     @ApiOperation("导出")
     @PostMapping("/excelPhone")
     public void excelPhone(HttpServletResponse response, @RequestBody PageQuery pageQuery) throws IOException {
+        Long companyId = SecurityUtils.getAuthenticatedUser().getCompanyId();
+        if (companyId != null) {
+            Map<String, Object> query = pageQuery.getQuery();
+            query.put("companyId", companyId);
+            pageQuery.setQuery(query);
+        }
         List<MintOrderDTO> data = all(pageQuery).map(MintOrderDTO::new).getContent();
         ExcelUtils.export(response, data);
     }

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

@@ -92,7 +92,13 @@ public class OrderController extends BaseController {
     @PostMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, @RequestBody PageQuery pageQuery) throws IOException {
-        List<Order> data = all(pageQuery).getContent();
+        Long companyId = SecurityUtils.getAuthenticatedUser().getCompanyId();
+        if (companyId != null) {
+            Map<String, Object> query = pageQuery.getQuery();
+            query.put("companyId", companyId);
+            pageQuery.setQuery(query);
+        }
+        List<Order> data = backAll(pageQuery).getContent();
         ExcelUtils.export(response, data.stream().map(order -> {
             OrderDTO dto = new OrderDTO();
             BeanUtils.copyProperties(order, dto);
@@ -193,7 +199,8 @@ public class OrderController extends BaseController {
         try {
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
-            response.setHeader("Content-Disposition", "attachment;filename=" + DateTimeUtils.format(LocalDateTime.now(), "MMdd") + ".xlsx");
+            response.setHeader("Content-Disposition", "attachment;filename=" + DateTimeUtils
+                    .format(LocalDateTime.now(), "MMdd") + ".xlsx");
             orderService.calcSettle(start, end, response.getOutputStream());
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -71,7 +71,7 @@ public class UserController extends BaseController {
         return userService.create(userRegister);
     }
 
-    @PreAuthorize("hasAnyRole('ADMIN', 'SHOWROOM')")
+    @PreAuthorize("hasAnyRole('ADMIN', 'SHOWROOM','ROLE_SAAS')")
     @PostMapping("/save")
     public User save(@RequestBody User user) {
         if (user.getId() != null) {