update

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@@ -172,5 +172,5 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
     void updateTotalUserDepartmentBatch(@Param("ids") List<String> customerDepartmentIds);
     void updateTotalUserAgencyBatch(@Param("ids") List<String> customerAgencyIds);
 
-    List<String> getAppMenu(AppUserIdMenuDTO dto);
+    List<Long> getAppMenu(AppUserIdMenuDTO dto);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -10,7 +10,6 @@ package com.elink.esua.epdc.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -61,8 +60,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     private SysRoleUserService sysRoleUserService;
     @Autowired
     private SysDeptService sysDeptService;
-    @Autowired
-    private UserRelationFeignClient userRelationFeignClient;
     @Resource
     private SysDeptDao sysDeptDao;
     @Resource
@@ -734,12 +731,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Override
     public Result getAppMenu(AppUserIdMenuDTO dto) {
         // 是否有菜单权限 ：0:否；1：是
-        Integer flag = 0;
-        List<String> list = baseDao.getAppMenu(dto);
-        if(list != null && list.size() > 0){
+        int flag = 0;
+        List<Long> list = baseDao.getAppMenu(dto);
+        if (CollUtil.isNotEmpty(list) && list.contains(dto.getGridId()) && list.contains(Long.parseLong(dto.getDeptId()))) {
             flag = 1;
         }
-
         return new Result().ok(flag);
     }
 

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -302,18 +302,14 @@
             #{id}
         </foreach>
     </update>
-    <select id="getAppMenu" parameterType="com.elink.esua.epdc.dto.AppUserIdMenuDTO" resultType="java.lang.String">
+    <select id="getAppMenu" parameterType="com.elink.esua.epdc.dto.AppUserIdMenuDTO" resultType="java.lang.Long">
         SELECT
-        sd.name
-        FROM sys_dept sd
-        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}
-        and sd.ID = #{gridId}
-
+            sd.id
+        FROM
+            sys_dept sd
+        WHERE
+            sd.pid IN ( SELECT dict.dict_value FROM sys_dict dict WHERE dict.dict_type = 'xlroute_testrun' AND dict.pid != '0' )
+            AND sd.del_flag = 0
     </select>
 
 </mapper>