From 87130655a4fcf6fbbd18278b49ade6f92b9d93d0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 8 Mar 2022 14:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java | 2 +- .../elink/esua/epdc/service/impl/AdminServiceImpl.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java index c95331382..b25f9a099 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java @@ -19,7 +19,7 @@ public class AppUserIdMenuDTO implements Serializable { @ApiModelProperty(value = "用户所属网格ID") // @NotBlank(message="用户ID不能为空") - private String gridId; + private Long gridId; @ApiModelProperty(value = "部门ID") @NotBlank(message="部门ID不能为空") diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index d2a3a3721..fa134c5e5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -7,7 +7,6 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.service.AdminService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,13 +47,7 @@ public class AdminServiceImpl implements AdminService { @Override public Result getAppMenu(TokenDto userDetail, AppUserIdMenuDTO dto) { - log.info("+++++userDetail.getGridId():+++++:" + userDetail.getGridId()); - log.info("+++++dto.getDeptId():+++++:" + dto.getDeptId()); - String gridId = userDetail.getGridId() == null ? "" : userDetail.getGridId()+""; - if(StringUtils.isBlank(gridId)){ - return new Result().error("token中缺失网格ID"); - } - dto.setGridId(gridId); + dto.setGridId(userDetail.getGridId()); return adminFeignClient.getAppMenu(dto); } }