From 4cee0f6bf5fd663207e2ba7e7571fcbb623de639 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 21 Jul 2021 10:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86institutionAndUser(S?= =?UTF-8?q?tring=20userName)=E6=8E=A5=E5=8F=A3,=E5=BD=93userName=E6=9C=89?= =?UTF-8?q?=E5=80=BC=E4=BA=8B=E6=90=9C=E7=B4=A2=E5=87=BA=E6=AD=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BB=A5=E5=8F=8A=E5=AE=83=E6=89=80=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E6=9C=BA=E6=9E=84,userName=E4=B8=BAnull=E6=97=B6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=85=A8=E9=83=A8=20=E6=B7=BB=E5=8A=A0getNext(String?= =?UTF-8?q?=20institutionId)=E6=8E=A5=E5=8F=A3,=E9=80=9A=E8=BF=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84id=E8=BF=94=E5=9B=9E=E6=AD=A4=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=AC=AC=E4=B8=80=E7=BA=A7=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E4=BA=BA=E5=91=98=20=E6=B7=BB=E5=8A=A0getFirstInstitu?= =?UTF-8?q?tion()=E6=8E=A5=E5=8F=A3,=E8=BF=94=E5=9B=9E=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 19 +++++++-- .../sarInstitution/dao/TsInstitutionDao.java | 16 +++++++- .../sarInstitution/entity/TsInstitution.java | 7 +++- .../impl/TsInstitutionServiceImpl.java | 41 +++++++++++++++++-- .../sarInstitution/TsInstitutionMapper.xml | 35 +++++++++++++++- 5 files changed, 108 insertions(+), 10 deletions(-) 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 22150189..beaa8d70 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 @@ -50,10 +50,10 @@ public class TsInstitutionController extends BaseController { * 查询所有机构和人员 * @return ResponseMessage> */ - @ApiOperation("查询所有机构和人员") + @ApiOperation("查询所有机构和人员或根据名称查询") @GetMapping("/institutionAndUser") - public ResponseMessage> getInstitutionAndUser(){ - List institutions=tsInstitutionService.getInstitutionAndUser(); + public ResponseMessage> getInstitutionAndUser(String userName){ + List institutions=tsInstitutionService.getInstitutionAndUser(userName); return Result.success(institutions); } @@ -76,6 +76,19 @@ public class TsInstitutionController extends BaseController { return Result.success(); } + @ApiOperation("获得下一级的部门和人员") + @GetMapping("/getNext") + public List getNext(String institutionId){ + return tsInstitutionService.getNext(institutionId); + } + + @ApiOperation("获得第一级部门目录") + @GetMapping("/getFirstInstitution") + public List getFirstInstitution(){ + return tsInstitutionService.getFirst(); + } + + public static void main(String[] args) { // System.out.println(json); } 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 91b59c27..8b8d2ee3 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 @@ -16,12 +16,26 @@ import java.util.List; * @since 2021-06-22 */ public interface TsInstitutionDao extends BaseMapper { + /** + * 根据部门id查询此部门的子一级部门 + * @return + */ + List selectNextInstitution(String institutionId); + + /** + * 根据部门id查询此部门的子一级人员 + * @return + */ + List selectNextUser(String institutionId); + + + /** * 查询最高级机构及其人员 * @return List */ - List selectRootAndUser(); + List selectRootAndUser(String userName); /** * 根据父节点查询机构及其人员 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index 51c3673c..5af267c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -15,7 +15,7 @@ import java.util.List; /** *

- * + * *

* * @author zyl @@ -59,6 +59,11 @@ public class TsInstitution extends BaseEntity { @ApiModelProperty("是否有子节点(1有，0没有)") private String hasChild; + + @ApiModelProperty("用户") + private TsUserVO tsUserVO; + + public TsInstitution() { } 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 b619ff0c..2e3c47cd 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 @@ -46,6 +46,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionAndUser() { + public List getInstitutionAndUser(String userName) { //查询第一层机构 - List institutionRoot=tsInstitutionDao.selectRootAndUser(); + List institutionRoot=tsInstitutionDao.selectRootAndUser(userName); + + //把查到的数据结构修改,把用户放 for(TsInstitution tsInstitution:institutionRoot){ tsInstitution.setDisabled(true); - tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution)); + tsInstitution.setChildren( recursionGetInstitutionAndUser(tsInstitution) ); for(TsUserVO user:tsInstitution.getUsers()){ if(tsInstitution.getChildren()==null){ tsInstitution.setChildren(new ArrayList<>()); @@ -145,6 +152,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl institutionObject=new ArrayList<>(); + //通过以此部门id作为父id查询它的子部门 List tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId()); for(TsInstitution tsInstitutionNode:tsInstitutions){ @@ -179,5 +187,30 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNext(String institutionId){ + List tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId); + List tsUsers=tsInstitutionDao.selectNextUser(institutionId); + + + for(TsInstitution tsInstitution:tsInstitutions){ + tsInstitution.setDisabled(true); + } + tsInstitutions.addAll(tsUsers); + return tsInstitutions; + } + + + public List getFirst(){ + //查询第一层机构 + List tsInstitutions = tsInstitutionDao.selectRootAndUser(null); + for(TsInstitution tsInstitution:tsInstitutions){ + tsInstitution.setDisabled(true); + } + return 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 7b91c84b..1e870059 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 @@ -14,11 +14,44 @@ + + + + + + + + + + + + + + + + + + + +