diff --git a/src/main/java/com/whdc/mapper/UnitDictMapper.java b/src/main/java/com/whdc/mapper/UnitDictMapper.java index 8f50759..61366cf 100644 --- a/src/main/java/com/whdc/mapper/UnitDictMapper.java +++ b/src/main/java/com/whdc/mapper/UnitDictMapper.java @@ -2,6 +2,7 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.model.entity.Organization; import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.UnitDict; @@ -16,5 +17,7 @@ public interface UnitDictMapper extends BaseMapper { IPage page(@Param("page") IPage page, @Param("dto") UnitDict dto); List find(@Param("dto") UnitDict dto); - - } \ No newline at end of file + + List findByUserId(@Param("userId") String userId); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IUnitDictService.java b/src/main/java/com/whdc/service/IUnitDictService.java index 05ebae1..c57e004 100644 --- a/src/main/java/com/whdc/service/IUnitDictService.java +++ b/src/main/java/com/whdc/service/IUnitDictService.java @@ -20,5 +20,6 @@ public interface IUnitDictService extends IService { // 获取所有规则 List find(UnitDict dto); + List findByUserId(String userId); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java index 70b073b..494d664 100644 --- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java @@ -48,7 +48,7 @@ public class OrganizationServiceImpl extends ServiceImpl findByUserId(String userId) { List organizations = baseMapper.findByUserId(userId); - List list = unitDictService.list(); + List list = unitDictService.findByUserId(userId); List tree = adinfoService.tree(null, null); Map> collect = list.stream().collect(Collectors.groupingBy(UnitDict::getOId)); diff --git a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java index 03e1c4f..7c402de 100644 --- a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java @@ -32,6 +32,10 @@ public class UnitDictServiceImpl extends ServiceImpl i return baseMapper.find(dto); } + @Override + public List findByUserId(String userId) { + return baseMapper.findByUserId(userId); + } } diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml index 8790541..284066e 100644 --- a/src/main/resources/mapper/UnitDictMapper.xml +++ b/src/main/resources/mapper/UnitDictMapper.xml @@ -7,7 +7,9 @@ - + +