diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/dic/dal/mapper/DictionaryBusinessMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/dic/dal/mapper/DictionaryBusinessMapper.java index c5256ac..bac3c9b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/dic/dal/mapper/DictionaryBusinessMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/dic/dal/mapper/DictionaryBusinessMapper.java @@ -1,6 +1,8 @@ package com.zt.plat.module.qms.common.dic.dal.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; @@ -21,6 +23,12 @@ import java.util.List; @Mapper public interface DictionaryBusinessMapper extends BaseMapperX { + @DeptDataPermissionIgnore(enable = "true") + default List selectListWithoutPermissionCheck(Wrapper queryWrapper){ + return selectList(queryWrapper); + } + + @DeptDataPermissionIgnore(enable = "true") default PageResult selectPage(DictionaryBusinessPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(DictionaryBusinessDO::getIdPath, reqVO.getIdPath()) @@ -36,7 +44,8 @@ public interface DictionaryBusinessMapper extends BaseMapperX selectItemByCategoryKeys(List keys) { return selectJoinList(DictionaryBusinessExtendRespVO.class, new MPJLambdaWrapperX() .leftJoin(DictionaryBusinessDO.class, "dbd", DictionaryBusinessDO::getId, DictionaryBusinessDO::getParentId) @@ -56,6 +65,7 @@ public interface DictionaryBusinessMapper extends BaseMapperX queryTableDictCustom(@Param("table") String table, @Param("text") String text, @Param("code") String code, @Param("filterSql") String filterSql, @Param("keys") List keys); @@ -64,7 +74,10 @@ public interface DictionaryBusinessMapper extends BaseMapperX parList = dictionaryBusinessMapper.selectList(query); + List parList = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); if(parList.isEmpty()) return dictMap; List parIds = parList.stream().map(DictionaryBusinessDO::getId).toList(); @@ -159,7 +159,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService query.in(DictionaryBusinessDO::getKey, itemKeys); else query.in(DictionaryBusinessDO::getId, itemKeys); - List itemList = dictionaryBusinessMapper.selectList(query); + List itemList = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); List modelItemList = new ArrayList<>(); for(DictionaryBusinessDO item: itemList){ Long parId = item.getParentId(); @@ -185,7 +185,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService // query.in(DictionaryBusinessDO::getKey, dictCodeList); // query.eq(DictionaryBusinessDO::getNodeType, DataTypeConstant.DATA_TYPE_CATEGORY); //// query.eq(DictionaryBusinessDO::getDeleted, 0); -// List parList = dictionaryBusinessMapper.selectList(query); +// List parList = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); // if(parList.isEmpty()) // return dictMap; // List parIds = parList.stream().map(DictionaryBusinessDO::getId).toList(); @@ -193,7 +193,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService // query.in(DictionaryBusinessDO::getParentId, parIds); // query.eq(DictionaryBusinessDO::getNodeType, DataTypeConstant.DATA_TYPE_DATA); // query.in(DictionaryBusinessDO::getId, ids); -// List itemList = dictionaryBusinessMapper.selectList(query); +// List itemList = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); // List modelItemList = new ArrayList<>(); // for(DictionaryBusinessDO item: itemList){ // Long parId = item.getParentId(); @@ -216,7 +216,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DictionaryBusinessDO::getKey, key); query.eq(DictionaryBusinessDO::getNodeType, DataTypeConstant.DATA_TYPE_CATEGORY); - List list = dictionaryBusinessMapper.selectList(query); + List list = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); if(list.isEmpty()) throw exception(DICTIONARY_BUSINESS_NOT_EXISTS); if(list.size() > 1) @@ -234,7 +234,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DictionaryBusinessDO::getKey, key); query.eq(DictionaryBusinessDO::getNodeType, DataTypeConstant.DATA_TYPE_DATA); - List list = dictionaryBusinessMapper.selectList(query); + List list = dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); if(list.isEmpty()) return CommonResult.error(DICTIONARY_BUSINESS_NOT_EXISTS); if(list.size() > 1) @@ -325,7 +325,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(DictionaryBusinessDO::getNodeType, DataTypeConstant.DATA_TYPE_CATEGORY); query.orderByAsc(DictionaryBusinessDO::getSortNo); - return dictionaryBusinessMapper.selectList(query); + return dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); } @Override @@ -335,7 +335,7 @@ public class DictionaryBusinessServiceImpl implements DictionaryBusinessService if(!ObjectUtils.isEmpty(nodeType)) query.eq(DictionaryBusinessDO::getNodeType, nodeType); query.orderByAsc(DictionaryBusinessDO::getSortNo); - return dictionaryBusinessMapper.selectList(query); + return dictionaryBusinessMapper.selectListWithoutPermissionCheck(query); } @Override