From a6664e7e5846129b4a0e9971510cbc0c1fda6163 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 11:50:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E6=A0=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=8A=E5=AD=90=E8=8A=82=E7=82=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileMaterialServiceImpl.java | 20 +++++++++++++++++-- .../slrs/zlTree/service/IZlTreeService.java | 3 +++ .../service/impl/ZlTreeServiceImpl.java | 19 ++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index 93f40f34..a77beb1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -10,18 +10,21 @@ import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData; import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService; +import com.adc.da.slrs.zlTree.service.IZlTreeService; import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.management.Query; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -44,6 +47,8 @@ public class FileMaterialServiceImpl extends ServiceImpl treeIds = new ArrayList<>(); + zlTreeService.subordinateTreeNodes(treeIds, queryPage.getTreeId()); + if (ObjectUtils.isEmpty(treeIds)) { return null; } + // 查看菜单是否有数据权限 + treeIds = treeIds.stream().filter(treeId -> treeIdList.contains(treeId)).collect(Collectors.toList()); + if (ObjectUtils.isEmpty(treeIds)) { + return null; + } + queryPage.setTreeIdList(treeIds); } + //dataType制空，不然节点重名会有bug + queryPage.setDataType(null); + queryPage.setTreeId(null); return fileMaterialDao.getFileMaterialPage(page,queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index 1ed663b7..e37b374c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Arrays; import java.util.List; /** @@ -51,4 +52,6 @@ public interface IZlTreeService extends IService { * @return */ ZlTree queryTree(String treeId); + + void subordinateTreeNodes(List treeIds,String parentTreeId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 98caaac2..4d9a6e88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -154,4 +154,23 @@ public class ZlTreeServiceImpl extends ServiceImpl implements } return null; } + + /** + * 根据树的父节点查询所有子节点id + * + * @param parentTreeId + * @return + */ + @Override + public void subordinateTreeNodes(List treeIds, String parentTreeId) { + treeIds.add(parentTreeId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("p_id", parentTreeId); + List list = list(queryWrapper); + if (ObjectUtils.isNotEmpty(list)) { + for (ZlTree zlTree : list) { + subordinateTreeNodes(treeIds,zlTree.getId()); + } + } + } } From e9cc5528d9749b93d5a9d8e61c8400a67d40b7cf Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 14:15:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileMaterialServiceImpl.java | 10 +++++++--- .../mapper/fileMaterialCenter/FileMaterialMapper.xml | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index a77beb1e..49f72ee1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -88,10 +88,14 @@ public class FileMaterialServiceImpl extends ServiceImpl fileMaterialPage = fileMaterialDao.getFileMaterialPage(page, queryPage); + if (ObjectUtils.isNotEmpty(queryPage.getDataType())) { + List fileMaterials = fileMaterialPage.getRecords().stream().filter(fileMaterial -> fileMaterial.getDataType().equals(queryPage.getDataType())).collect(Collectors.toList()); + fileMaterialPage.setRecords(fileMaterials); + fileMaterialPage.setTotal(fileMaterials.size()); + } + return fileMaterialPage; } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 9642feb1..886a9f25 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -38,9 +38,6 @@ and fm.id=#{flieM.id} - - AND fm.data_type like concat('%',#{flieM.dataType},'%') - AND fm.data_title like concat('%',#{flieM.dataTitle},'%') From 8bacb5befea5d48f944ba909a8bf7a8123182682 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 14:32:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?disableFlag=E4=B8=BA1=E7=9A=84=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=9C=A8=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=BA=E5=91=98=E4=B8=AD=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 012d967b..bb1bae1c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -155,7 +155,7 @@ LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id WHERE ts_user_position.position_id in ( SELECT ts_position_role.position_id from ts_position_role - WHERE ts_position_role.role_id = #{role.roleId} ) + WHERE ts_position_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' and ts_user.USID like concat(concat('%',#{role.userId}),'%') @@ -177,7 +177,7 @@ LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id WHERE ts_user_position.position_id in ( SELECT ts_position_role.position_id from ts_position_role - WHERE ts_position_role.role_id = #{role.roleId} ) + WHERE ts_position_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' and ts_user.USID like concat(concat('%',#{role.userId}),'%')