Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java

@@ -127,8 +127,8 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserRealName())){
            Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserRealName());
        if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserName())){
            Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserName());
            if (userId==null){
                userId = -1L;
            }