下载信息调整

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WechatWorkController.java

@@ -9,6 +9,8 @@ import com.gic.clerk.api.dto.AuthorizedUser;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.web.handle.WechatWorkLostClerkHandle;
 import com.gic.haoban.manage.web.handle.WechatWorkLostDetailHandle;
 import com.gic.haoban.manage.web.handle.WechatWorkLostStoreGroupHandle;
@@ -22,7 +24,6 @@ import com.gic.web.common.controller.NewBaseController;
 import com.gic.web.common.download.DownloadTask;
 import com.gic.web.common.download.DownloadTaskUtil;
 import com.gic.web.common.download.constants.TaskTypeEnum;
-import com.gic.web.common.utils.SessionContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,11 +158,11 @@ public class WechatWorkController extends NewBaseController {
      */
     @RequestMapping(value = "export-lost-store-group")
     public RestResponse exportLostStoreGroup(@RequestBody WechatWorkLostStoreGroupQO qo) {
-        AuthorizedUser user = SessionContextUtils.getLoginUser();
+
         DownloadTask task = new DownloadTask();
         task.setTaskTypeEnum(TaskTypeEnum.STORE_RANK_DOWNLOAD);
         task.setDataType(qo.getDataType());
-        task.setUser(user);
+        task.setUser(getUserInfo());
 
         task.setTotalCount(lostStoreGroup(qo).getResult().getTotalNum());
 
@@ -253,11 +254,10 @@ public class WechatWorkController extends NewBaseController {
      */
     @RequestMapping(value = "export-lost-clerk")
     public RestResponse exportLostClerk(@RequestBody WechatWorkLostClerkQO qo) {
-        AuthorizedUser user = SessionContextUtils.getLoginUser();
         DownloadTask task = new DownloadTask();
         task.setTaskTypeEnum(TaskTypeEnum.STORE_RANK_DOWNLOAD);
         task.setDataType(qo.getDataType());
-        task.setUser(user);
+        task.setUser(getUserInfo());
 
         task.setTotalCount(lostClerk(qo).getResult().getTotalNum());
 
@@ -330,11 +330,10 @@ public class WechatWorkController extends NewBaseController {
      */
     @RequestMapping(value = "export-lost-detail")
     public RestResponse exportLostDetail(@RequestBody WechatWorkLostDetailQO qo) {
-        AuthorizedUser user = SessionContextUtils.getLoginUser();
         DownloadTask task = new DownloadTask();
         task.setTaskTypeEnum(TaskTypeEnum.STORE_RANK_DOWNLOAD);
         task.setDataType(qo.getDataType());
-        task.setUser(user);
+        task.setUser(getUserInfo());
 
         task.setTotalCount(lostDetail(qo).getResult().getTotalNum());
 
@@ -382,5 +381,13 @@ public class WechatWorkController extends NewBaseController {
         return RestResponse.successResult(downloadTask.getResult());
     }
 
+    private AuthorizedUser getUserInfo() {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        AuthorizedUser user = new AuthorizedUser();
+        user.setUserId(loginUser.getClerkId());
+        user.setEnterpriseId(loginUser.getEnterpriseId());
+        user.setRealName(loginUser.getClerkName());
+        return user;
+    }
 
 }