diff --git a/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java b/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java index 08bb49f..2e038e1 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java +++ b/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java @@ -9,6 +9,7 @@ import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; import com.muyu.source.domain.AssetAuthorization; import com.muyu.source.domain.TableInfo; +import com.muyu.source.domain.rep.AssetAuthorizationRep; import com.muyu.source.domain.rep.TableInfoResp; import com.muyu.source.service.AssetAuthorizationService; import com.muyu.source.service.TableInfoService; @@ -96,9 +97,9 @@ public class TableInfoController { // 获取用户的部门ID Long deptId = sysUser.getDeptId(); // 根据用户ID查询授权的表ID和基本信息 - List idByUserId = assetAuthorizationService.findTableIdAndBasicIdByUserId(userId); + List idByUserId = assetAuthorizationService.findTableIdAndBasicIdByUserId(userId); // 根据部门ID查询授权的表ID和基本信息 - List idByDeptId = assetAuthorizationService.findTableIdAndBasicIdByDeptId(deptId); + List idByDeptId = assetAuthorizationService.findTableIdAndBasicIdByDeptId(deptId); // 创建一个HashSet用于存储授权的表信息 HashSet hashSet = new HashSet<>(); // 将用户ID授权的表信息添加到hashSet中 @@ -134,9 +135,9 @@ public class TableInfoController { * @param idByDeptId 授权信息 * @param hashSet 授权信息 */ - private void extracted(List idByDeptId, HashSet hashSet) { + private void extracted(List idByDeptId, HashSet hashSet) { // 遍历AssetAuthorizationReq列表 - for (AssetAuthorization assetImpowerResp : idByDeptId) { + for (AssetAuthorizationRep assetImpowerResp : idByDeptId) { // 获取当前AssetAuthorizationReq对象的basicId和tableId Long basicId = assetImpowerResp.getBasicId(); Long tableId = assetImpowerResp.getTableId(); diff --git a/muyu-source-server/src/main/java/com/muyu/source/mapper/AssetAuthorizationMapper.java b/muyu-source-server/src/main/java/com/muyu/source/mapper/AssetAuthorizationMapper.java index 08f93bc..1b4bbc6 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/mapper/AssetAuthorizationMapper.java +++ b/muyu-source-server/src/main/java/com/muyu/source/mapper/AssetAuthorizationMapper.java @@ -2,6 +2,7 @@ package com.muyu.source.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.source.domain.AssetAuthorization; +import com.muyu.source.domain.rep.AssetAuthorizationRep; import com.muyu.source.domain.req.AssetAuthorizationReq; import org.apache.ibatis.annotations.Mapper; @@ -21,4 +22,8 @@ public interface AssetAuthorizationMapper extends BaseMapper List findDeptIdList(AssetAuthorizationReq req); + + List findTableIdAndBasicIdByUserId(Long userId); + + List findTableIdAndBasicIdByDeptId(Long deptId); } diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/AssetAuthorizationService.java b/muyu-source-server/src/main/java/com/muyu/source/service/AssetAuthorizationService.java index eef878b..ed8be80 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/service/AssetAuthorizationService.java +++ b/muyu-source-server/src/main/java/com/muyu/source/service/AssetAuthorizationService.java @@ -22,14 +22,14 @@ public interface AssetAuthorizationService extends IService * @param userId 用户ID * @return 授权的表ID和基本信息 */ - List findTableIdAndBasicIdByUserId(Long userId); + List findTableIdAndBasicIdByUserId(Long userId); /** * 根据部门ID查询授权的表ID和基本信息 * @param deptId 部门ID * @return 授权的表ID和基本信息 */ - List findTableIdAndBasicIdByDeptId(Long deptId); + List findTableIdAndBasicIdByDeptId(Long deptId); /** * 查询资产赋权用户信息 diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/AssetAuthorizationServiceImpl.java b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/AssetAuthorizationServiceImpl.java index 7ec21d4..88ac78f 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/AssetAuthorizationServiceImpl.java +++ b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/AssetAuthorizationServiceImpl.java @@ -39,10 +39,9 @@ public class AssetAuthorizationServiceImpl extends ServiceImpl findTableIdAndBasicIdByUserId(Long userId) { - return assetAuthorizationMapper.selectList(new LambdaQueryWrapper<>() {{ - eq(AssetAuthorization::getUserId, userId); - }}); + public List findTableIdAndBasicIdByUserId(Long userId) { + List assetAuthorizationReps = assetAuthorizationMapper.findTableIdAndBasicIdByUserId(userId); + return assetAuthorizationReps; } /** * 根据部门ID查询授权的表ID和基本信息 @@ -51,11 +50,9 @@ public class AssetAuthorizationServiceImpl extends ServiceImpl findTableIdAndBasicIdByDeptId(Long deptId) { - return assetAuthorizationMapper.selectList(new LambdaQueryWrapper<>() {{ - eq(AssetAuthorization::getDeptId, deptId); - }}); - + public List findTableIdAndBasicIdByDeptId(Long deptId) { + List assetAuthorizationReps = assetAuthorizationMapper.findTableIdAndBasicIdByDeptId(deptId); + return assetAuthorizationReps; } /** * 查询资产赋权用户信息 diff --git a/muyu-source-server/src/main/resources/mapper/AssetAccreditMapper.xml b/muyu-source-server/src/main/resources/mapper/AssetAccreditMapper.xml index b38fe9a..0f9bee8 100644 --- a/muyu-source-server/src/main/resources/mapper/AssetAccreditMapper.xml +++ b/muyu-source-server/src/main/resources/mapper/AssetAccreditMapper.xml @@ -37,5 +37,29 @@ + + diff --git a/muyu-source-server/src/main/resources/mapper/SysUserMapper.xml b/muyu-source-server/src/main/resources/mapper/SysUserMapper.xml index 7ed9413..56c7e54 100644 --- a/muyu-source-server/src/main/resources/mapper/SysUserMapper.xml +++ b/muyu-source-server/src/main/resources/mapper/SysUserMapper.xml @@ -5,7 +5,7 @@ - select * from sys_user where user_id=#{userId}