Merge remote-tracking branch 'origin/master'

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SuperviseOrganServiceImpl.java

@@ -30,10 +30,10 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService {
 
     @Override
     public Page<SuperviseOrganEmpVO> superviseOrganEmpList(Page<SuperviseOrganEmpVO> page, Long organId, Boolean isIncluded, String organName, String superviseType, String superviseName, String superviseTel, String status) {
-        return superviseOrganEmpMapper.superviseOrganEmpList(page, getOrganIds(organId, isIncluded, organFeignService), organName, superviseType, superviseName, superviseTel, status);
+        return superviseOrganEmpMapper.superviseOrganEmpList(page, getOrganIds(organId, isIncluded), organName, superviseType, superviseName, superviseTel, status);
     }
 
-    private List<Long> getOrganIds(Long organId, Boolean isIncluded, OrganFeignService organFeignService) {
+    private List<Long> getOrganIds(Long organId, Boolean isIncluded) {
         Result<List<Long>> organChild = null;
         List<Long> organIds = null;
         if (organId != null) {
@@ -85,7 +85,7 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService {
 
     @Override
     public Page<SuperviseOrganVO> superviseOrganList(Page<SuperviseOrganVO> page, Long organId, Boolean isIncluded, String spvOrganName) {
-        return superviseOrganMapper.superviseOrganList(page, getOrganIds(organId, isIncluded, organFeignService), spvOrganName);
+        return superviseOrganMapper.superviseOrganList(page, getOrganIds(organId, isIncluded), spvOrganName);
     }
 
     @Override