From 35d0667ff3f09f8d3bfc015687b7efbe8bb15cba Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 8 Mar 2022 09:29:58 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java | 4 ++-- .../src/main/resources/mapper/SysUserDao.xml | 5 +++-- .../elink/esua/epdc/controller/ApiSysUserController.java | 6 ++++-- .../java/com/elink/esua/epdc/feign/AdminFeignClient.java | 1 + .../esua/epdc/feign/fallback/AdminFeignClientFallback.java | 1 + .../java/com/elink/esua/epdc/service/SysUserService.java | 3 ++- .../elink/esua/epdc/service/impl/SysUserServiceImpl.java | 4 +++- 7 files changed, 16 insertions(+), 8 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 45428d1e5..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 @@ -17,9 +17,9 @@ public class AppUserIdMenuDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "用户ID") + @ApiModelProperty(value = "用户所属网格ID") // @NotBlank(message="用户ID不能为空") - private String userId; + private Long gridId; @ApiModelProperty(value = "部门ID") @NotBlank(message="部门ID不能为空") diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 1fbb6b764..01e23aa54 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -306,12 +306,13 @@ SELECT sd.name FROM sys_dept sd - left join sys_dict dict on (sd.ID = dict.dict_value or sd.pid = dict.dict_value) and dict.pid != '0' + left join sys_dict dict on sd.PID = dict.dict_value and dict.pid != '0' where sd.del_flag = 0 and dict.del_flag = 0 and dict.ID is not null and dict.dict_type = 'xlroute_testrun' - and (sd.ID = #{deptId} or sd.pid = #{deptId}) + and sd.ID = #{deptId} + and sd.ID = #{gridId} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java index 04146ee01..b53aee64f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java @@ -1,5 +1,7 @@ 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.utils.Result; import com.elink.esua.epdc.dto.AppUserIdMenuDTO; import com.elink.esua.epdc.dto.ModifyPwdDTO; @@ -45,8 +47,8 @@ public class ApiSysUserController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("getAppMenu") - public Result getAppMenu(@RequestBody AppUserIdMenuDTO dto) { - return sysUserService.getAppMenu(dto); + public Result getAppMenu(@LoginUser TokenDto userDetail, @RequestBody AppUserIdMenuDTO dto) { + return sysUserService.getAppMenu(userDetail,dto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 7bd42e554..dcf8b7b07 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.*; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index d239d51f4..013e1d47e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign.fallback; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 3b4c18741..08a589284 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.service; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.AppUserIdMenuDTO; import com.elink.esua.epdc.dto.ModifyPwdDTO; @@ -27,5 +28,5 @@ public interface SysUserService { * @param dto * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result getAppMenu(AppUserIdMenuDTO dto); + Result getAppMenu(TokenDto userDetail,AppUserIdMenuDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 8c9b747ef..f411c73d7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.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.utils.Result; import com.elink.esua.epdc.dto.AppUserIdMenuDTO; import com.elink.esua.epdc.dto.ModifyPwdDTO; @@ -32,7 +33,8 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public Result getAppMenu(AppUserIdMenuDTO dto) { + public Result getAppMenu(TokenDto userDetail,AppUserIdMenuDTO dto) { + dto.setGridId(userDetail.getGridId()); return adminFeignClient.getAppMenu(dto); } }