修改

src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -130,4 +130,7 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "所属公司ID")
     private String belongCompanyId;
 
+    @ApiModelProperty(value = "所属公司名称")
+    private String belongCompanyName;
+
 }

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -59,7 +59,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return  getBaseMapper().selectPage(page , lambdaQueryWrapper);
     }
 
-    public IPage<TmHouse> getAuditHouseList(String houseTitle , Integer status, int type,
+    public IPage<TmHouse> getAuditHouseList(String houseTitle , Integer status, Integer type,
                                                 String belongCompany , String estateName , Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(houseTitle)){
@@ -76,7 +76,9 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         if(StringUtils.isNotBlank(belongCompany)){
             lambdaQueryWrapper.eq(TmHouse::getBelongCompanyId , belongCompany);
         }
-        lambdaQueryWrapper.eq(TmHouse::getType , type);
+        if(null != type){
+            lambdaQueryWrapper.eq(TmHouse::getType , type);
+        }
         IPage<TmHouse> page = new Page<>(pageNum , pageSize , true);
         return  getBaseMapper().selectPage(page , lambdaQueryWrapper);
     }

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -96,12 +96,29 @@ public class HouseManagerController {
                                          @RequestParam(name = "type") Integer type,
                                          @RequestParam(name = "estateId") String estateId,
                                          @RequestParam(name = "pageNum")Long pageNum,
-                                         @RequestParam(name = "pageSize")Long pageSize){
+                                         @RequestParam(name = "pageSize")Long pageSize,
+                                       HttpServletRequest request){
         if(StringUtils.isBlank(estateId)){
 
             return Result.failure("楼盘ID不能为空");
         }
-
+        String token = request.getHeader("token");
+        if(StringUtils.isBlank(token)){
+            return Result.failure("token缺失");
+        }
+        JSONObject tokenJson = new JSONObject();
+        try {
+            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
+            if(null == tokenJson){
+                return Result.failure("登录失效，需要重新登录");
+            }
+        }catch (Exception e){
+            log.info("json数据转换出现异常:{}" , e);
+        }
+        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
+        if(null == tokenMap){
+            return Result.failure("解析token失败");
+        }
         IPage<TmHouse> resultPage = tmHouseService.getListByNameOrBelong(houseTitle , status , type , estateId , pageNum , pageSize);
         return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
@@ -120,7 +137,7 @@ public class HouseManagerController {
     })
     public Result<Object> getAuditHouseList(@RequestParam(required = false) String houseTitle,
                                        @RequestParam(required = false) Integer status,
-                                       @RequestParam(name = "type") Integer type,
+                                       @RequestParam(required = false , name = "type") Integer type,
                                        @RequestParam(name = "belongCompany") String belongCompany,
                                        @RequestParam(name = "estateName") String estateName,
                                        @RequestParam(name = "pageNum")Long pageNum,
@@ -283,6 +300,7 @@ public class HouseManagerController {
 
         TmHouse tmHouse = new TmHouse();
         tmHouse.setEstateId(estateId);
+        tmHouse.setEstateName(tmEstate.getEstateName());
         if(null != tokenMap){
             tmHouse.setCreateById(tokenMap.getId());
             tmHouse.setCreateByName(tokenMap.getUserName());