Lianxun_Java.git

			@@ -419,9 +419,9 @@
			floorId = floorDtos.get(0).getFloorId();
			if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) \|\| StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
			floorPo = new FloorPo();
			floorPo.setbId("-1");
			//floorPo.setbId("-1");
			floorPo.setCommunityId(importOwnerRoomDto.getCommunityId());
			floorPo.setFloorArea("1");
			//floorPo.setFloorArea("1");
			floorPo.setFloorId(floorId);
			floorPo.setFloorNum(importOwnerRoomDto.getFloorNum());
			floorPo.setName(importOwnerRoomDto.getFloorNum()+"栋");

			@@ -52,6 +52,7 @@
			//根据房屋查询时先用房屋信息查询业主ID
			freshRoomId(reqJson);


			if (reqJson.containsKey("name") && !StringUtil.isEmpty(reqJson.getString("name"))) {
			queryByCondition(reqJson, cmdDataFlowContext);
			return;
			@@ -134,14 +135,20 @@
			*/
			private void queryByCondition(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
			//获取当前用户id
			String ownerTypeCd = reqJson.getString("ownerTypeCd");
			OwnerDto tmpOwnerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
			if(!StringUtil.isEmpty(ownerTypeCd)&& ownerTypeCd.contains(",")){
			tmpOwnerDto.setOwnerTypeCd("");
			tmpOwnerDto.setOwnerTypeCds(ownerTypeCd.split(","));
			}
			String userId = reqJson.getString("userId");
			int row = reqJson.getInteger("row");
			ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
			int total = ownerInnerServiceSMOImpl.queryOwnerCountByCondition(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
			int total = ownerInnerServiceSMOImpl.queryOwnerCountByCondition(tmpOwnerDto);
			apiOwnerVo.setTotal(total);
			List<OwnerDto> ownerDtos = new ArrayList<>();
			if (total > 0) {
			List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
			List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
			List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
			for (OwnerDto ownerDto : ownerDtoList) {
			//对业主身份证号隐藏处理

	service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史