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); } }