小程序菜单权限配置

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不能为空")

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}
 
     </select>
 

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) {
+    public Result getAppMenu(@LoginUser TokenDto userDetail, @RequestBody AppUserIdMenuDTO dto) {
-        return sysUserService.getAppMenu(dto);
+        return sysUserService.getAppMenu(userDetail,dto);
     }
 
 }

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.*;

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;

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

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