From 7dbc2a267b146c7ebc05ce2f04f17c09d543242e Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 8 Mar 2022 15:46:47 +0800
Subject: [PATCH] update

---
 .../com/elink/esua/epdc/dao/SysUserDao.java    |  2 +-
 .../epdc/service/impl/SysUserServiceImpl.java  | 18 +++++++-----------
 .../src/main/resources/mapper/SysUserDao.xml   | 18 +++++++-----------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java
index fd4a80ef7..2d4c28814 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java
+++ b/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);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
index c3531c89f..8a43ae754 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
+++ b/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
@@ -264,9 +261,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                 staffEntity.setActiveFlag("active");
                 staffEntity.setActiveTime(new Date());
                 staffEntity.setEnableFlag("enable");
-                if(StringUtils.isEmpty(entity.getPassword())){
+                if (StringUtils.isEmpty(entity.getPassword())) {
                     staffEntity.setPassword(PasswordUtils.encode(sysUserEntity.getPassword()));
-                }else {
+                } else {
                     staffEntity.setPassword(PasswordUtils.encode(entity.getPassword()));
                 }
                 customerStaffDao.insert(staffEntity);
@@ -286,7 +283,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             wrapper.eq("STAFF_ID", dto.getId().toString());
             StaffOrgRelationEntity staffOrgRelationEntity = staffOrgRelationDao.selectOne(wrapper);
             String typeKey = deptEntity.getTypeKey();
-            if(staffOrgRelationEntity==null){
+            if (staffOrgRelationEntity == null) {
                 StaffOrgRelationEntity orgRelationEntity = new StaffOrgRelationEntity();
                 orgRelationEntity.setId(entity.getId().toString());
                 orgRelationEntity.setCustomerId(sysDictEntity.getDictValue());
@@ -301,7 +298,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     orgRelationEntity.setOrgType("agency");
                 }
                 staffOrgRelationDao.insert(orgRelationEntity);
-            }else {
+            } else {
                 staffOrgRelationEntity.setPids(StringUtils.join(StringUtils.split(deptEntity.getPids(), ","), ":"));
                 staffOrgRelationEntity.setOrgId(deptEntity.getId().toString());
                 if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) {
@@ -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);
     }
 
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 01e23aa54..e3ca36f54 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
@@ -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>