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

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -233,8 +233,8 @@ public class IcResiUserController {
     }
 
     @RequestMapping(value = "/exportExcel")
-    public void exportExcelByEasyExcel(@RequestHeader String customerId,/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
-        tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
+    public void exportExcelByEasyExcel(@RequestHeader String customerId,@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+        //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
         CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
         String staffOrgPath = null;
         if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {