Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -210,10 +210,10 @@ public class EpmetUserController {
     }
 
     @GetMapping("export/staffpatroll")
-    public void export( @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
         ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        //formDTO.setUserId(tokenDto.getUserId());
-        formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
+        formDTO.setUserId(tokenDto.getUserId());
+        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
         List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
         ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
     }