房间，楼栋，楼栋长，小区app代码

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppBuildingController.java

@@ -35,7 +35,7 @@ public class AppBuildingController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteBuildingService.selectComprehensiveBuildingList(pageNum, pageSize,comprehensivebuilding.getBuildName(),comprehensivebuilding.getEstateId(),comprehensivebuilding.getDeptId());
+        TableDataInfo tableDataInfo = remoteBuildingService.selectComprehensiveBuildingList(pageNum, pageSize,comprehensivebuilding.getBuildName(),comprehensivebuilding.getEstateId());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
             return AjaxResult.success(tableDataInfo.getRows());
         }else{

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppBuildingLeaderController.java

@@ -39,7 +39,7 @@ public class AppBuildingLeaderController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteBuildingLeaderService.selectComprehensiveBuildingLeaderList(pageNum, pageSize,comprehensivebuildingleader.getUserName(),comprehensivebuildingleader.getDeptId());
+        TableDataInfo tableDataInfo = remoteBuildingLeaderService.selectComprehensiveBuildingLeaderList(pageNum, pageSize,comprehensivebuildingleader.getUserName());
         Map<String, Object> maps = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);
         Map<String, Object> maps1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
         Map<String, Object> maps2 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppHousingEstateController.java

@@ -35,7 +35,7 @@ public class AppHousingEstateController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteHousingEstateService.selectComprehensiveHousingEstaterList(pageNum, pageSize,comprehensivehousingestate.getEstateName(),comprehensivehousingestate.getDeptId());
+        TableDataInfo tableDataInfo = remoteHousingEstateService.selectComprehensiveHousingEstaterList(pageNum, pageSize,comprehensivehousingestate.getEstateName());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
             return AjaxResult.success(tableDataInfo.getRows());
         }else{
@@ -87,13 +87,13 @@ public class AppHousingEstateController extends BaseController {
      * 小区下拉选小区管理
      */
     @GetMapping("/comprehensivehousingestate/getHousingEstate")
-    public AjaxResult getHousingEstate(@RequestParam("deptId") String deptId) {
-        return remoteHousingEstateService.getHousingEstate(deptId);
+    public AjaxResult getHousingEstate(ComprehensiveHousingEstate comprehensiveHousingEstate) {
+        return remoteHousingEstateService.getHousingEstate(comprehensiveHousingEstate);
     }
 
 
     @GetMapping("/comprehensivehousingestate/getDeptInfo")
-    public AjaxResult getDeptInfo(@RequestParam("deptId") String deptId){
-        return remoteHousingEstateService.getDeptInfo(deptId);
+    public AjaxResult getDeptInfo(){
+        return remoteHousingEstateService.getDeptInfo();
     }
 }

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppRoomController.java

@@ -40,7 +40,7 @@ public class AppRoomController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteRoomService.selectComprehensiveRoomList(pageNum, pageSize,comprehensiveroom.getName(),comprehensiveroom.getEstateId(),comprehensiveroom.getDeptId());
+        TableDataInfo tableDataInfo = remoteRoomService.selectComprehensiveRoomList(pageNum, pageSize,comprehensiveroom.getName(),comprehensiveroom.getEstateId());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
             List<ComprehensiveRoom> rows = (List<ComprehensiveRoom>) tableDataInfo.getRows();
             Map<String, Object> dictCacheToMap = DictUtils.getDictCacheToMap(DictKeys.RFH_FJ_GLFS);