From f2d86046f9b5a122e7593a95b6ff3ce911ac98b6 Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期四, 18 三月 2021 08:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
index 332f1b7..0a79897 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComOpsHouseDAO;
import com.panzhihua.service_community.model.dos.ComOpsHouseDO;
import com.panzhihua.service_community.service.ComOpsHouseService;
@@ -106,6 +107,13 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserRealName())){
+ Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserRealName());
+ if (userId==null){
+ userId = -1L;
+ }
+ pageComOpsHouseDTO.setUserId(userId);
+ }
IPage<ComOpsHouseVO> iPage = comOpsHouseDAO.pageHouse(page, pageComOpsHouseDTO);
return R.ok(iPage);
--
Gitblit v1.7.1