diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 1615a683..b3887516 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -82,8 +82,8 @@ public class TsInstitutionController extends BaseController { @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") - public List getNext(String institutionId){ - return tsInstitutionService.getNext(institutionId); + public List getNext(String institutionId,String userName){ + return tsInstitutionService.getNext(institutionId,userName); } @ApiOperation("获得第一级部门目录") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 8f7b76a9..bc0b5780 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -27,7 +27,7 @@ public interface TsInstitutionDao extends BaseMapper { * 根据部门id查询此部门的子一级人员 * @return */ - List selectNextUser(String institutionId); + List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); List selectTreeByIds(@Param("rootIds") List rootIds); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index af1e8996..48d24c8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -35,7 +35,7 @@ public interface ITsInstitutionService extends IService { * @param institutionId * @return */ - public List getNext(String institutionId); + public List getNext(String institutionId,String userName); /** * 获得第一级的部门 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 0d78c184..ce821462 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -204,9 +204,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNext(String institutionId){ + public List getNext(String institutionId,String userName){ List tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId); - List tsUsers=tsInstitutionDao.selectNextUser(institutionId); + List tsUsers=tsInstitutionDao.selectNextUser(institutionId,userName); for(TsInstitution tsInstitution:tsInstitutions){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index b3f53de2..1678191c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -39,6 +39,9 @@