diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index d5e8d6d..8e7fc76 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; @@ -63,7 +62,7 @@ public class ApiAdminController { * @since 2021/8/28 18:43 */ @GetMapping("/sysUser/gridmanList") - public Result> getGridmanList(@LoginUser UserDetail userDetail, EpdcAppGridManFormDTO formDto){ + public Result> getGridmanList(@LoginUser TokenDto userDetail, EpdcAppGridManFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return adminService.getGridmanList(userDetail,formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index 1c627ba..d5d69ab 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -1,6 +1,6 @@ package com.elink.esua.epdc.service; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; @@ -73,5 +73,5 @@ public interface AdminService { * @author zhangfenghe * @since 2021/8/28 18:41 */ - Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto); + Result> getGridmanList(TokenDto userDetail, EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index da7666c..5c02e02 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.service.impl; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; @@ -125,11 +126,11 @@ public class AdminServiceImpl implements AdminService { } @Override - public Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) { + public Result> getGridmanList(TokenDto userDetail, EpdcAppGridManFormDTO formDto) { if(null == userDetail){ return new Result>().error("获取Token信息失败"); } - formDto.setDeptId(userDetail.getDeptId()); + formDto.setDeptId(userDetail.getGridId()); return adminFeignClient.getGridmanList(formDto); } }