代码提交 bug代码更新

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<List<EpdcAppGridManListResultDTO>> getGridmanList(@LoginUser UserDetail userDetail, EpdcAppGridManFormDTO formDto){
+    public Result<List<EpdcAppGridManListResultDTO>> getGridmanList(@LoginUser TokenDto userDetail, EpdcAppGridManFormDTO formDto){
         ValidatorUtils.validateEntity(formDto);
         return adminService.getGridmanList(userDetail,formDto);
     }

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<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto);
+    Result<List<EpdcAppGridManListResultDTO>> getGridmanList(TokenDto userDetail, EpdcAppGridManFormDTO formDto);
 }

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<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) {
+    public Result<List<EpdcAppGridManListResultDTO>> getGridmanList(TokenDto userDetail, EpdcAppGridManFormDTO formDto) {
         if(null == userDetail){
           return  new Result<List<EpdcAppGridManListResultDTO>>().error("获取Token信息失败");
         }
-        formDto.setDeptId(userDetail.getDeptId());
+        formDto.setDeptId(userDetail.getGridId());
         return adminFeignClient.getGridmanList(formDto);
     }
 }