1、审核记录和访客记录的审核字段统一修改成auditStatus

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/ApplyUser.java

@@ -177,13 +177,13 @@ public class ApplyUser extends BaseEntity {
 	/**
 	* 申请的记录类型 0--认证类型 1--新增类型 2--编辑类型(通过user编辑生成的) 3--编辑类型(通过applyUser编辑生成)
 	*/
-		@ApiModelProperty(value = "申请的记录类型 0--认证类型 1--新增类型 2--编辑类型(通过user编辑生成的) 3--编辑类型(通过applyUser编辑生成)")
+		@ApiModelProperty(value = "申请的记录类型 0--认证房屋 1--添加家人")
 		private Integer recordType;
 	/**
 	* 旧照片
 	*/
 		@ApiModelProperty(value = "旧照片")
-		private String oldImageUri;
+		private String oldFaceUrl;
 	/**
 	* 审核人类型：1-业主，2-后台
 	*/

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/GuestRecord.java

@@ -141,7 +141,7 @@ public class GuestRecord extends BaseEntity {
 	* 审核状态：0-待审核 1-审核通过 2-审核不通过
 	*/
 		@ApiModelProperty(value = "审核状态：0-待审核 1-审核通过 2-审核不通过")
-		private Integer checkState;
+		private Integer auditStatus;
 	/**
 	* 脸部照片url（没有域名）
 	*/

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/ApplyUserClientFallback.java

@@ -1,6 +1,7 @@
 package org.springblade.estate.feign;
 
 import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
 import org.springblade.estate.dto.ApplyUserDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.vo.ApplyUserVO;

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IApplyUserClient.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.plugins.Page;
 import io.swagger.annotations.ApiParam;
 import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
 import org.springblade.estate.dto.ApplyUserDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.vo.ApplyUserVO;

blade-service-api/grid-api/src/main/java/org/springblade/community/grid/vo/Houseuser.java

@@ -78,7 +78,7 @@ public class Houseuser extends BaseEntity {
 	* 人脸审核状态：-1：未上传，0-待审核 1-审核通过 2-审核不通过
 	*/
 		@ApiModelProperty(value = "人脸审核状态：-1：未上传，0-待审核 1-审核通过 2-审核不通过")
-		private Integer checkState;
+		private Integer auditStatus;
 	/**
 	* 人脸审核意见 s_check_state=2(审核不通过)时必填
 	*/

blade-service-api/person-api/src/main/java/org/springblade/person/entity/HouseUser.java

@@ -266,12 +266,6 @@ public class HouseUser extends TenantEntity {
 		@ApiModelProperty("旧平台Id")
 		private String oldId;
 
-	/**
-	 * 是否会员
-	 */
-		@ApiModelProperty("是否会员")
-		private Integer isMember;
-
 	/**
 	 * 小区省id
 	 */

blade-service-api/person-api/src/main/java/org/springblade/person/entity/Member.java

@@ -47,7 +47,7 @@ public class Member extends BaseEntity {
 	* 电话号码
 	*/
 		@ApiModelProperty(value = "电话号码")
-		private String tel;
+		private String phone;
 	/**
 	* 登录密码(md5字符串)
 	*/

blade-service/community/pom.xml

@@ -27,6 +27,12 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
             <version>2.8.0.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springblade</groupId>
+                    <artifactId>blade-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

blade-service/community/src/main/java/org/springblade/community/controller/AgencyController.java

@@ -17,12 +17,7 @@
 package org.springblade.community.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -32,15 +27,11 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.common.constant.CommonConstant;
-import org.springblade.community.dto.AgencymngDTO;
 import org.springblade.community.entity.Building;
 import org.springblade.community.entity.Residential;
-import org.springblade.community.entity.Unit;
 import org.springblade.community.service.IBuildingService;
 import org.springblade.community.service.IResidentialService;
-import org.springblade.community.service.IUnitService;
 import org.springblade.community.vo.AgencyInfoVO;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.enterprise.feign.IEnterpriseClient;
 import org.springblade.enterprise.feign.IStaffClient;
@@ -50,15 +41,12 @@ import org.springblade.person.feign.IHouseUserClient;
 import org.springblade.system.expand.entity.TenantType;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.ITenantTypeClient;
-import org.springblade.system.expand.util.*;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.vo.TenantTypeVO;
-import org.springframework.boot.autoconfigure.info.ProjectInfoProperties;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,7 +58,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 控制器
@@ -199,7 +186,7 @@ public class AgencyController extends BladeController {
 		TenantType tenantType = new TenantType();
 		tenantType.setTenantId(tenantId);
 		TenantTypeVO tenantTypeVO = typeClient.detail(tenantType);
-		if (CommonConstant.TenantType.COMMUNITY.getValue().equals(tenantTypeVO.getTenantType())) {
+		if (true) {
 			//社区,统计入驻社区，居民数
 			int residentialCount = residentialService.count(Condition.getQueryWrapper(new Residential()).lambda().eq(Residential::getAgencyId, agencyId));
 			agencyInfoVO.setResidentialCount(residentialCount);

blade-service/community/src/main/java/org/springblade/community/controller/AgencymngController.java

@@ -26,6 +26,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.community.dto.AgencymngDTO;
 import org.springblade.community.entity.*;
 import org.springblade.community.service.*;

blade-service/estate/src/main/java/org/springblade/estate/controller/ApplyUserController.java

@@ -90,7 +90,7 @@ public class ApplyUserController extends BladeController {
 	public R<ApplyUserVO> detail(ApplyUser applyUser) {
 		ApplyUser detail = applyUserService.getOne(Condition.getQueryWrapper(applyUser));
 //		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
-		return R.data(ApplyUserWrapper.build(confClient).entityVO(detail));
+		return R.data(ApplyUserWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -104,7 +104,7 @@ public class ApplyUserController extends BladeController {
 		queryWrapper.lambda().orderByDesc(ApplyUser::getCreateTime);
 		IPage<ApplyUser> pages = applyUserService.page(Condition.getPage(query), queryWrapper);
 //		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
-		return R.data(ApplyUserWrapper.build(confClient).pageVO(pages));
+		return R.data(ApplyUserWrapper.build().pageVO(pages));
 	}
 
 

blade-service/estate/src/main/java/org/springblade/estate/controller/GuestRecordController.java

@@ -123,10 +123,10 @@ public class GuestRecordController extends BladeController {
 		if(StringUtil.isNotBlank(guestRecord.getFaceUrl())){
 			guestRecord.setFaceUrl(confClient.removePrefix(guestRecord.getFaceUrl()));
 		}
-		guestRecord.setCheckState(1);
+		guestRecord.setAuditStatus(1);
 		boolean save = guestRecordService.save(guestRecord);
 		if(save){
-			if(guestRecord.getCheckState() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())){
+			if(guestRecord.getAuditStatus() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())){
 				R result = this.guestRecordService.pushFace(guestRecord.getId());
 				return result;
 			}
@@ -145,9 +145,9 @@ public class GuestRecordController extends BladeController {
 			guestRecord.setFaceUrl(confClient.removePrefix(guestRecord.getFaceUrl()));
 		}
 		guestRecordService.updateById(guestRecord);
-		if(guestRecord.getCheckState() == 1){
+		if(guestRecord.getAuditStatus() == 1){
 			guestRecordService.pushFace(guestRecord.getId());
-		}else if(guestRecord.getCheckState() == 2) {
+		}else if(guestRecord.getAuditStatus() == 2) {
 			guestRecordService.deleteFace(guestRecord.getId());
 		}
 		return R.status(true);
@@ -217,7 +217,7 @@ public class GuestRecordController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "审核", notes = "传入guest")
 	public R audit(@Valid @RequestBody GuestRecord guestRecord) {
-		return this.guestRecordService.audit(guestRecord.getId(), guestRecord.getCheckState(), guestRecord.getOpinion());
+		return this.guestRecordService.audit(guestRecord.getId(), guestRecord.getAuditStatus(), guestRecord.getOpinion());
 	}
 
 
@@ -276,10 +276,10 @@ public class GuestRecordController extends BladeController {
 		LambdaQueryWrapper<GuestRecord> queryWrapper = null;
 		if (type.equals(0)) {
 			//访客人员待下发列表
-			queryWrapper = Condition.getQueryWrapper(new GuestRecord()).lambda().eq(GuestRecord::getCheckState,CommonConstant.UserAuditStatus.pass.getValue()).notIn(CollUtil.isNotEmpty(userIdList), GuestRecord::getId,userIdList);
+			queryWrapper = Condition.getQueryWrapper(new GuestRecord()).lambda().eq(GuestRecord::getAuditStatus,CommonConstant.UserAuditStatus.pass.getValue()).notIn(CollUtil.isNotEmpty(userIdList), GuestRecord::getId,userIdList);
 		}else if(type.equals(1)){
 			//访客人员已下发列表
-			queryWrapper = Condition.getQueryWrapper(new GuestRecord()).lambda().eq(GuestRecord::getCheckState,CommonConstant.UserAuditStatus.pass.getValue()).in(CollUtil.isNotEmpty(userIdList), GuestRecord::getId,userIdList);
+			queryWrapper = Condition.getQueryWrapper(new GuestRecord()).lambda().eq(GuestRecord::getAuditStatus,CommonConstant.UserAuditStatus.pass.getValue()).in(CollUtil.isNotEmpty(userIdList), GuestRecord::getId,userIdList);
 		}
 		IPage<GuestRecord> guestRecordIPage = guestRecordService.page(Condition.getPage(query), queryWrapper);
 		return R.data(guestRecordIPage);

blade-service/estate/src/main/java/org/springblade/estate/controller/UserFacePermissionsController.java

@@ -197,10 +197,10 @@ public class UserFacePermissionsController extends BladeController {
 		List<Long> ids = userAccessPermissionsService.getUserIdsByUserType(CommonConstant.UserFlag.GUEST_FLAG.getValue());
 		//待审核
 		int waitCount = guestRecordService.count(Condition.getQueryWrapper(new GuestRecord()).lambda()
-			.eq(GuestRecord::getCheckState, CommonConstant.UserAuditStatus.wait.getValue()));
+			.eq(GuestRecord::getAuditStatus, CommonConstant.UserAuditStatus.wait.getValue()));
 		//已审核
 		int passCount = guestRecordService.count(Condition.getQueryWrapper(new GuestRecord()).lambda()
-			.eq(GuestRecord::getCheckState, CommonConstant.UserAuditStatus.pass.getValue()));
+			.eq(GuestRecord::getAuditStatus, CommonConstant.UserAuditStatus.pass.getValue()));
 		//已下发
 		int yxfCount = guestRecordService.count(Condition.getQueryWrapper(new GuestRecord()).lambda()
 			.in(CollUtil.isNotEmpty(ids), GuestRecord::getId, ids));

blade-service/estate/src/main/java/org/springblade/estate/feign/ApplyUserClient.java

@@ -13,9 +13,12 @@ import javax.validation.Valid;
 import org.springblade.common.constant.ConfConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.ApplyUserDTO;
+import org.springblade.person.entity.HouseUser;
+import org.springblade.person.vo.HouseUserVO;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -52,7 +55,7 @@ public class ApplyUserClient implements IApplyUserClient {
     public ApplyUserVO detail(@SpringQueryMap ApplyUser applyUser) {
         ApplyUser detail = applyUserService.getOne(Condition.getQueryWrapper(applyUser));
 //		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
-        return ApplyUserWrapper.build(confClient).entityVO(detail);
+        return ApplyUserWrapper.build().entityVO(detail);
         }
 
 	@Override
@@ -69,7 +72,7 @@ public class ApplyUserClient implements IApplyUserClient {
     public List<ApplyUserVO> list(@SpringQueryMap ApplyUser applyUser) {
 
 		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
-        return ApplyUserWrapper.build(confClient).listVO(applyUserService.list(Condition.getQueryWrapper(applyUser)));
+        return ApplyUserWrapper.build().listVO(applyUserService.list(Condition.getQueryWrapper(applyUser)));
         }
 
 	@Override
@@ -144,7 +147,7 @@ public class ApplyUserClient implements IApplyUserClient {
 		}
 		lambda.orderByDesc(ApplyUser::getCreateTime);
 		IPage<ApplyUser> page = this.applyUserService.page(Condition.getPage(applyUserDTO.getQuery()), lambda);
-		IPage<ApplyUserVO> applyUserVOIPage = ApplyUserWrapper.build(confClient).pageVO(page);
+		IPage<ApplyUserVO> applyUserVOIPage = ApplyUserWrapper.build().pageVO(page);
 		BladePage<ApplyUserVO> bladePage = new BladePage<>();
 		bladePage.setCurrent(applyUserVOIPage.getCurrent());
 		bladePage.setTotal(applyUserVOIPage.getTotal());

blade-service/estate/src/main/java/org/springblade/estate/feign/GuestRecordRecordClient.java

@@ -121,7 +121,7 @@ public class GuestRecordRecordClient implements IGuestRecordClient {
 	@Override
 	@PostMapping(value = "/audit")
 	public R audit(@RequestBody GuestRecord guestRecord) {
-		return guestService.audit(guestRecord.getId(), guestRecord.getCheckState(), guestRecord.getOpinion());
+		return guestService.audit(guestRecord.getId(), guestRecord.getAuditStatus(), guestRecord.getOpinion());
 	}
 
 

blade-service/estate/src/main/java/org/springblade/estate/service/IApplyUserService.java

@@ -16,11 +16,13 @@
  */
 package org.springblade.estate.service;
 
+import org.springblade.core.tool.api.R;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.estate.vo.ApplyUserVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.person.entity.HouseUser;
 
 /**
  * 申请用户表---房屋成员 服务类

blade-service/estate/src/main/java/org/springblade/estate/service/impl/ApplyUserServiceImpl.java

@@ -26,10 +26,17 @@ import org.springblade.community.feign.ICommunityClient;
 import org.springblade.community.feign.IRoomClient;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.device.dto.DispatchTask;
 import org.springblade.device.dto.UserInfoDto;
 import org.springblade.device.feign.IDoorDeviceClient;
+import org.springblade.device.vo.DoorDeviceVO;
+import org.springblade.estate.dto.ApplyUserDTO;
+import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.ApplyUser;
+import org.springblade.estate.service.IUserAccessPermissionsService;
 import org.springblade.estate.vo.ApplyUserVO;
 import org.springblade.estate.mapper.ApplyUserMapper;
 import org.springblade.estate.service.IApplyUserService;
@@ -47,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 申请用户表---房屋成员 服务实现类
@@ -63,17 +71,19 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 	private final IConfClient confClient;
 	private final IDoorDeviceClient doorDeviceClient;
 	private final IRoomClient roomClient;
+	private final IUserAccessPermissionsService userAccessPermissionsService;
 
 
 	@Autowired
 	public ApplyUserServiceImpl(IMemberClient memberClient, IHouseUserClient houseUserClient
-		, ICommunityClient communityClient, IConfClient confClient, IDoorDeviceClient doorDeviceClient, IRoomClient roomClient) {
+		, ICommunityClient communityClient, IConfClient confClient, IDoorDeviceClient doorDeviceClient, IRoomClient roomClient, IUserAccessPermissionsService userAccessPermissionsService) {
 		this.memberClient = memberClient;
 		this.houseUserClient = houseUserClient;
 		this.communityClient = communityClient;
 		this.confClient = confClient;
 		this.doorDeviceClient = doorDeviceClient;
 		this.roomClient = roomClient;
+		this.userAccessPermissionsService = userAccessPermissionsService;
 	}
 
 	@Override
@@ -103,9 +113,9 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 
 	}
 
-	@Override
-	@Transactional
-	public boolean addApplyUserForFamily(ApplyUser applyUser) {
+//	@Override
+//	@Transactional
+	public boolean addApplyUserForFamilyBak(ApplyUser applyUser) {
 		applyUser.setFaceUrl(confClient.removePrefix(applyUser.getFaceUrl()));
 		applyUser.setEntryImgUri(confClient.removePrefix(applyUser.getEntryImgUri()));
 		applyUser.setPassportImgUri(confClient.removePrefix(applyUser.getPassportImgUri()));
@@ -225,6 +235,51 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		return result;
 	}
 
+	/**
+	 * 添加家人
+	 * @param applyUser
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public boolean addApplyUserForFamily(ApplyUser applyUser) {
+		applyUser.setFaceUrl(confClient.removePrefix(applyUser.getFaceUrl()));
+		applyUser.setEntryImgUri(confClient.removePrefix(applyUser.getEntryImgUri()));
+		applyUser.setPassportImgUri(confClient.removePrefix(applyUser.getPassportImgUri()));
+		boolean save = false;
+		if(applyUser.getType() != 0){
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
+			this.save(applyUser);
+			//构造一个HouseUser
+			HouseUser houseUser = this.applyUserToUser(applyUser);
+			save = houseUserClient.save(houseUser);
+			houseUser = this.houseUserClient.applySave(houseUser);
+			if(save){
+				//新增人数
+				communityClient.addPersonNum(houseUser.getAgencyId(), houseUser.getResidentialId()
+					, houseUser.getBuildingId(), houseUser.getUnitId(), houseUser.getFloorId(), houseUser.getRoomId());
+				//给成员和租户下发人脸
+				UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
+				userAccessPermissionsDTO.setUserId(Func.toStr(houseUser.getId()));
+				userAccessPermissionsDTO.setUserFace(houseUser.getFaceUrl());
+				userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
+				userAccessPermissionsDTO.setTargetType(1);
+				List<DoorDeviceVO> doorDeviceVOList = doorDeviceClient.getListByResidentialAndUnit(houseUser.getResidentialId(), houseUser.getUnitId(), 1);
+				if (doorDeviceVOList.size() != 0) {
+					List<Long> deviceIdList = doorDeviceVOList.stream().map(DoorDeviceVO::getId).collect(Collectors.toList());
+					userAccessPermissionsDTO.setDeviceIds(StringUtil.join(deviceIdList, ","));
+					userAccessPermissionsService.pushFace(userAccessPermissionsDTO);
+				}
+				return save;
+
+			}else{
+				return false;
+			}
+		}else{
+			return this.save(applyUser);
+		}
+	}
+
 	@Override
 	@Transactional
 	public boolean updateCheckState(ApplyUser condition) {
@@ -365,9 +420,9 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 	private HouseUser applyUserToUser(ApplyUser applyUser) {
 		HouseUser user = new HouseUser();
 		user.setName(applyUser.getName());
+		user.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 		if (StringUtils.isNotBlank(applyUser.getFaceUrl())) {
 			user.setFaceUrl(applyUser.getFaceUrl());
-			user.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			user.setImageMd5(applyUser.getImageMd5());
 			user.setFaceEnable(1); //未激活
 		} else {
@@ -394,7 +449,6 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		user.setResidentialId(applyUser.getResidentialId());
 		user.setResidentialName(applyUser.getResidentialName());
 		user.setCreateType(applyUser.getCreateType());
-		user.setIsMember(0);
 		return user;
 	}
 

blade-service/estate/src/main/java/org/springblade/estate/service/impl/GuestRecordServiceImpl.java

@@ -76,10 +76,10 @@ public class GuestRecordServiceImpl extends BaseServiceImpl<GuestRecordMapper, G
 	public R audit(Long guestId, Integer checkState, String opinion) {
 		GuestRecord guestRecord = this.getById(guestId);
 		Assert.notNull(guestRecord, "访客记录不存在，审核失败");
-		guestRecord.setCheckState(checkState);
+		guestRecord.setAuditStatus(checkState);
 		guestRecord.setOpinion(opinion);
 		boolean result = this.updateById(guestRecord);
-		if (result && guestRecord.getCheckState() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())) {//若审核通过，下发访客信息到门禁设备，如果访客有人脸信息也下发到门禁设备
+		if (result && guestRecord.getAuditStatus() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())) {//若审核通过，下发访客信息到门禁设备，如果访客有人脸信息也下发到门禁设备
 			return this.pushFace(guestId);
 		}
 		return R.status(true);

blade-service/estate/src/main/java/org/springblade/estate/wrapper/ApplyUserWrapper.java

@@ -16,6 +16,11 @@
  */
 package org.springblade.estate.wrapper;
 
+import org.springblade.community.entity.Building;
+import org.springblade.community.entity.Residential;
+import org.springblade.community.entity.Room;
+import org.springblade.community.entity.Unit;
+import org.springblade.community.feign.*;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -33,14 +38,22 @@ import java.util.Objects;
  */
 public class ApplyUserWrapper extends BaseEntityWrapper<ApplyUser, ApplyUserVO>  {
 
-	private IConfClient confClient;
+	private static IConfClient confClient;
+	private static IResidentialClient residentialClient;
+	private static IBuildingClient buildingClient;
+	private static IUnitClient unitClient;
+	private static IRoomClient roomClient;
 
-	public ApplyUserWrapper(IConfClient confClient) {
-		this.confClient = confClient;
+	static {
+		confClient = SpringUtil.getBean(IConfClient.class);
+		residentialClient = SpringUtil.getBean(IResidentialClient.class);
+		buildingClient = SpringUtil.getBean(IBuildingClient.class);
+		unitClient = SpringUtil.getBean(IUnitClient.class);
+		roomClient = SpringUtil.getBean(IRoomClient.class);
 	}
 
-	public static ApplyUserWrapper build(IConfClient confClient) {
-		return new ApplyUserWrapper(confClient);
+	public static ApplyUserWrapper build() {
+		return new ApplyUserWrapper();
  	}
 
 
@@ -50,6 +63,22 @@ public class ApplyUserWrapper extends BaseEntityWrapper<ApplyUser, ApplyUserVO>
 		applyUserVO.setPassportImgUri(confClient.addPrefix(applyUser.getPassportImgUri()));
 		applyUserVO.setEntryImgUri(confClient.addPrefix(applyUser.getEntryImgUri()));
 		applyUserVO.setFaceUrl(confClient.addPrefix(applyUser.getFaceUrl()));
+		if(applyUser.getResidentialId() != null){
+			Residential residential = residentialClient.getById(applyUser.getResidentialId());
+			applyUserVO.setResidentialName(residential.getName());
+		}
+		if(applyUser.getBuildingId() != null){
+			Building building = buildingClient.getById(applyUser.getBuildingId());
+			applyUserVO.setBuildingName(building.getName());
+		}
+		if(applyUser.getUnitId() != null){
+			Unit unit = unitClient.getById(applyUser.getUnitId());
+			applyUserVO.setUnitName(unit.getName());
+		}
+		if(applyUser.getRoomId() != null){
+			Room room = roomClient.getById(applyUser.getRoomId());
+			applyUserVO.setRoomName(room.getName());
+		}
 		return applyUserVO;
 	}
 

blade-service/person/src/main/java/org/springblade/person/controller/HouseUserController.java

@@ -41,27 +41,17 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.device.dto.DispatchTask;
-import org.springblade.device.dto.UserInfoDto;
-import org.springblade.enterprise.entity.Enterprise;
-import org.springblade.enterprise.entity.Staff;
 import org.springblade.enterprise.vo.ChartDataVO;
 import org.springblade.enterprise.vo.EnterpriseBizTypePieDataVO;
-import org.springblade.estate.entity.CarEnterRecord;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.person.entity.*;
-import org.springblade.person.feign.IHouseUserClient;
 import org.springblade.person.service.*;
 import org.springblade.person.vo.HouseUserVO;
-import org.springblade.person.wrapper.HouserUserWrapper;
+import org.springblade.person.wrapper.HouseUserWrapper;
 import org.springblade.system.entity.DictBiz;
-import org.springblade.system.expand.entity.OrgPosition;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springblade.system.expand.util.QueryWrapperUtil;
-import org.springblade.system.expand.vo.OrgPositionVO;
 import org.springblade.system.feign.IDictBizClient;
-import org.springblade.third.doordevice.feign.IDoorDeviceButtClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -116,7 +106,7 @@ public class HouseUserController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入basicInfo")
 	public R<HouseUserVO> detail(HouseUser houseUser) {
 		HouseUser detail = houseUserService.getOne(Condition.getQueryWrapper(houseUser));
-		return R.data(HouserUserWrapper.build().entityVO(detail));
+		return R.data(HouseUserWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -140,7 +130,7 @@ public class HouseUserController extends BladeController {
 		QueryWrapper<HouseUser> queryWrapper = Condition.getQueryWrapper(houseUser, HouseUser.class);
 		queryWrapper.lambda().orderByDesc(HouseUser::getCreateTime);
 		IPage<HouseUser> pages = houseUserService.page(Condition.getPage(query), queryWrapper);
-		return R.data(HouserUserWrapper.build().pageVO(pages));
+		return R.data(HouseUserWrapper.build().pageVO(pages));
 	}
 
 

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -10,22 +10,18 @@ import lombok.AllArgsConstructor;
 
 import javax.validation.Valid;
 
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.enterprise.entity.Staff;
-import org.springblade.estate.entity.ApplyUser;
-import org.springblade.estate.entity.Repair;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.service.HouseUserService;
 import org.springblade.person.vo.HouseUserVO;
-import org.springblade.person.wrapper.HouserUserWrapper;
+import org.springblade.person.wrapper.HouseUserWrapper;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
@@ -33,10 +29,8 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  *  client
@@ -63,7 +57,7 @@ public class HouseUserClient implements IHouseUserClient {
     @GetMapping("/detail")
     public HouseUserVO detail(@SpringQueryMap HouseUser houseUser) {
         HouseUser detail = houseUserService.getOne(Condition.getQueryWrapper(houseUser));
-        return HouserUserWrapper.build().entityVO(detail);
+        return HouseUserWrapper.build().entityVO(detail);
         }
 
     /**
@@ -72,22 +66,21 @@ public class HouseUserClient implements IHouseUserClient {
     @Override
     @GetMapping("/list")
     public List<HouseUserVO> list(@SpringQueryMap HouseUser houseUser) {
-		LambdaQueryWrapper<HouseUser> queryWrapper = new QueryWrapperUtil<HouseUser>().getBasicQueryWrapper(HouseUser::getOrgPosition, houseUser, AuthUtil.getUser(), orgPositionClient);
-		return HouserUserWrapper.build().listVO(houseUserService.list(queryWrapper));
+		return HouseUserWrapper.build().listVO(houseUserService.list(Condition.getQueryWrapper(houseUser)));
         }
 
 	@Override
 	@GetMapping("/listMap")
 	public List<HouseUserVO> listMap(@RequestParam Map<String, Object> houseUser) {
 		LambdaQueryWrapper<HouseUser> queryWrapper = new QueryWrapperUtil<HouseUser>().getBasicQueryWrapperByMap(HouseUser::getOrgPosition, houseUser,new HouseUser(), AuthUtil.getUser(), orgPositionClient);
-		return HouserUserWrapper.build().listVO(houseUserService.list(queryWrapper));
+		return HouseUserWrapper.build().listVO(houseUserService.list(queryWrapper));
 	}
 
 	@Override
 	@PostMapping("/getListByUserIds")
 	public List<HouseUserVO> getListByUserIds(@RequestParam List<Long> userIds) {
 		List<HouseUser> list = houseUserService.list(new QueryWrapper<>(new HouseUser()).lambda().in(HouseUser::getId, userIds));
-		return HouserUserWrapper.build().listVO(list);
+		return HouseUserWrapper.build().listVO(list);
 	}
 
 	@Override
@@ -96,7 +89,7 @@ public class HouseUserClient implements IHouseUserClient {
 		Page<HouseUserVO> result = new Page<>();
     	IPage<HouseUser> page = houseUserService.page(Condition.getPage(query), new QueryWrapper<>(new HouseUser()).lambda().in(HouseUser::getRoomId, roomIds));
 
-		IPage<HouseUserVO> houseUserVOIPage = HouserUserWrapper.build().pageVO(page);
+		IPage<HouseUserVO> houseUserVOIPage = HouseUserWrapper.build().pageVO(page);
 
 		result.setSize(((int) houseUserVOIPage.getSize()));
 		result.setCurrent((int)houseUserVOIPage.getCurrent());
@@ -191,7 +184,7 @@ public class HouseUserClient implements IHouseUserClient {
 		lambda.eq(HouseUser::getMemberId, memberId);
 		lambda.eq(residentialId != null, HouseUser::getResidentialId, residentialId);
 		lambda.eq(roomId != null, HouseUser::getRoomId, roomId);
-		return HouserUserWrapper.build().listVO(houseUserService.list(lambda));
+		return HouseUserWrapper.build().listVO(houseUserService.list(lambda));
 //		List<ApplyUser> applyUserList = applyUserClient.getListByMember(memberId, residentialId, null, CommonConstant.UserAuditStatus.pass.getValue());
 //		List<HouseUser> userList = new ArrayList<>();
 //		if(applyUserList.size() > 0){
@@ -208,7 +201,7 @@ public class HouseUserClient implements IHouseUserClient {
 	@PostMapping("/getPageByMember")
 	public R<BladePage<HouseUserVO>> getPageByMember(@RequestBody HouseUserDTO houseUserDTO) {
 		IPage<HouseUser> houseUserIPage = this.houseUserService.page(Condition.getPage(houseUserDTO.getQuery()), Condition.getQueryWrapper(houseUserDTO));
-		IPage<HouseUserVO> houseUserVOIPage = HouserUserWrapper.build().pageVO(houseUserIPage);
+		IPage<HouseUserVO> houseUserVOIPage = HouseUserWrapper.build().pageVO(houseUserIPage);
 		return R.data(BladePage.of(houseUserVOIPage));
 	}
 

blade-service/person/src/main/java/org/springblade/person/mapper/MemberMapper.xml

@@ -13,7 +13,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
-        <result column="tel" property="tel"/>
+        <result column="phone" property="phone"/>
         <result column="password" property="password"/>
         <result column="sex" property="sex"/>
         <result column="state" property="state"/>

blade-service/person/src/main/java/org/springblade/person/wrapper/AdolescentWrapper.java

@@ -83,7 +83,6 @@ public class AdolescentWrapper extends BaseEntityWrapper<Adolescent, AdolescentV
 			adolescentVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 			adolescentVO.setFaceEndDate(houseUser.getFaceEndDate());
 			adolescentVO.setOldId(houseUser.getOldId());
-			adolescentVO.setIsMember(houseUser.getIsMember());
 			adolescentVO.setRegionProvince(houseUser.getRegionProvince());
 			adolescentVO.setRegionCity(houseUser.getRegionCity());
 			adolescentVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/AidsWrapper.java

@@ -84,7 +84,6 @@ public class AidsWrapper extends BaseEntityWrapper<Aids, AidsVO>  {
 		aidsVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		aidsVO.setFaceEndDate(houseUser.getFaceEndDate());
 		aidsVO.setOldId(houseUser.getOldId());
-		aidsVO.setIsMember(houseUser.getIsMember());
 		aidsVO.setRegionProvince(houseUser.getRegionProvince());
 		aidsVO.setRegionCity(houseUser.getRegionCity());
 		aidsVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/AllowancesPeopleWrapper.java

@@ -87,7 +87,6 @@ public class AllowancesPeopleWrapper extends BaseEntityWrapper<AllowancesPeople,
 			allowancesPeopleVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 			allowancesPeopleVO.setFaceEndDate(houseUser.getFaceEndDate());
 			allowancesPeopleVO.setOldId(houseUser.getOldId());
-			allowancesPeopleVO.setIsMember(houseUser.getIsMember());
 			allowancesPeopleVO.setRegionProvince(houseUser.getRegionProvince());
 			allowancesPeopleVO.setRegionCity(houseUser.getRegionCity());
 			allowancesPeopleVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/CorrectionalStaffWrapper.java

@@ -84,7 +84,6 @@ public class CorrectionalStaffWrapper extends BaseEntityWrapper<CorrectionalStaf
 		correctionalStaffVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		correctionalStaffVO.setFaceEndDate(houseUser.getFaceEndDate());
 		correctionalStaffVO.setOldId(houseUser.getOldId());
-		correctionalStaffVO.setIsMember(houseUser.getIsMember());
 		correctionalStaffVO.setRegionProvince(houseUser.getRegionProvince());
 		correctionalStaffVO.setRegionCity(houseUser.getRegionCity());
 		correctionalStaffVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/DisablerWrapper.java

@@ -85,7 +85,6 @@ public class DisablerWrapper extends BaseEntityWrapper<Disabler, DisablerVO>  {
 		disablerVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		disablerVO.setFaceEndDate(houseUser.getFaceEndDate());
 		disablerVO.setOldId(houseUser.getOldId());
-		disablerVO.setIsMember(houseUser.getIsMember());
 		disablerVO.setRegionProvince(houseUser.getRegionProvince());
 		disablerVO.setRegionCity(houseUser.getRegionCity());
 		disablerVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/DrugWrapper.java

@@ -86,7 +86,6 @@ public class DrugWrapper extends BaseEntityWrapper<Drug, DrugVO>  {
 		drugVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		drugVO.setFaceEndDate(houseUser.getFaceEndDate());
 		drugVO.setOldId(houseUser.getOldId());
-		drugVO.setIsMember(houseUser.getIsMember());
 		drugVO.setRegionProvince(houseUser.getRegionProvince());
 		drugVO.setRegionCity(houseUser.getRegionCity());
 		drugVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/ElderlyPeopleWrapper.java

@@ -85,7 +85,6 @@ public class ElderlyPeopleWrapper extends BaseEntityWrapper<ElderlyPeople, Elder
 		elderlyPeopleVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		elderlyPeopleVO.setFaceEndDate(houseUser.getFaceEndDate());
 		elderlyPeopleVO.setOldId(houseUser.getOldId());
-		elderlyPeopleVO.setIsMember(houseUser.getIsMember());
 		elderlyPeopleVO.setRegionProvince(houseUser.getRegionProvince());
 		elderlyPeopleVO.setRegionCity(houseUser.getRegionCity());
 		elderlyPeopleVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/EstablishFilecardWrapper.java

@@ -84,7 +84,6 @@ public class EstablishFilecardWrapper extends BaseEntityWrapper<EstablishFilecar
 		establishFilecardVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		establishFilecardVO.setFaceEndDate(houseUser.getFaceEndDate());
 		establishFilecardVO.setOldId(houseUser.getOldId());
-		establishFilecardVO.setIsMember(houseUser.getIsMember());
 		establishFilecardVO.setRegionProvince(houseUser.getRegionProvince());
 		establishFilecardVO.setRegionCity(houseUser.getRegionCity());
 		establishFilecardVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/FertileWomanWrapper.java

@@ -84,7 +84,6 @@ public class FertileWomanWrapper extends BaseEntityWrapper<FertileWoman, Fertile
 		fertileWomanVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		fertileWomanVO.setFaceEndDate(houseUser.getFaceEndDate());
 		fertileWomanVO.setOldId(houseUser.getOldId());
-		fertileWomanVO.setIsMember(houseUser.getIsMember());
 		fertileWomanVO.setRegionProvince(houseUser.getRegionProvince());
 		fertileWomanVO.setRegionCity(houseUser.getRegionCity());
 		fertileWomanVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/HouserUserWrapper.java → blade-service/person/src/main/java/org/springblade/person/wrapper/HouseUserWrapper.java

@@ -19,10 +19,8 @@ package org.springblade.person.wrapper;
 import org.springblade.community.entity.*;
 import org.springblade.community.feign.*;
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.vo.HouseUserVO;
 import org.springblade.system.expand.feign.IConfClient;
@@ -35,7 +33,7 @@ import java.util.Objects;
  * @author BladeX
  * @since 2021-04-14
  */
-public class HouserUserWrapper extends BaseEntityWrapper<HouseUser, HouseUserVO>  {
+public class HouseUserWrapper extends BaseEntityWrapper<HouseUser, HouseUserVO>  {
 
 	public static IConfClient confClient;
 	private static IAgencyClient agencyClient;
@@ -55,8 +53,8 @@ public class HouserUserWrapper extends BaseEntityWrapper<HouseUser, HouseUserVO>
 		roomClient = SpringUtil.getBean(IRoomClient.class);
 	}
 
-	public static HouserUserWrapper build() {
-		return new HouserUserWrapper();
+	public static HouseUserWrapper build() {
+		return new HouseUserWrapper();
  	}
 
 	@Override

blade-service/person/src/main/java/org/springblade/person/wrapper/PrisonerWrapper.java

@@ -84,7 +84,6 @@ public class PrisonerWrapper extends BaseEntityWrapper<Prisoner, PrisonerVO>  {
 		prisonerVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		prisonerVO.setFaceEndDate(houseUser.getFaceEndDate());
 		prisonerVO.setOldId(houseUser.getOldId());
-		prisonerVO.setIsMember(houseUser.getIsMember());
 		prisonerVO.setRegionProvince(houseUser.getRegionProvince());
 		prisonerVO.setRegionCity(houseUser.getRegionCity());
 		prisonerVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/PsychiatricWrapper.java

@@ -84,7 +84,6 @@ public class PsychiatricWrapper extends BaseEntityWrapper<Psychiatric, Psychiatr
 		psychiatricVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		psychiatricVO.setFaceEndDate(houseUser.getFaceEndDate());
 		psychiatricVO.setOldId(houseUser.getOldId());
-		psychiatricVO.setIsMember(houseUser.getIsMember());
 		psychiatricVO.setRegionProvince(houseUser.getRegionProvince());
 		psychiatricVO.setRegionCity(houseUser.getRegionCity());
 		psychiatricVO.setRegionArea(houseUser.getRegionArea());

blade-service/person/src/main/java/org/springblade/person/wrapper/VeteransWrapper.java

@@ -84,7 +84,6 @@ public class VeteransWrapper extends BaseEntityWrapper<Veterans, VeteransVO>  {
 		veteransVO.setFaceBeginDate(houseUser.getFaceBeginDate());
 		veteransVO.setFaceEndDate(houseUser.getFaceEndDate());
 		veteransVO.setOldId(houseUser.getOldId());
-		veteransVO.setIsMember(houseUser.getIsMember());
 		veteransVO.setRegionProvince(houseUser.getRegionProvince());
 		veteransVO.setRegionCity(houseUser.getRegionCity());
 		veteransVO.setRegionArea(houseUser.getRegionArea());

blade-service/third/src/main/java/org/springblade/datamigration/controller/EstateController.java

@@ -87,10 +87,9 @@ public class EstateController {
 			applyUser.setBuildingName(room.getBuildingName());
 			applyUser.setResidentialId(room.getResidentialId());
 			applyUser.setResidentialName(room.getResidentialName());
-			applyUser.setOrgPosition(room.getOrgPosition()+"/"+applyUser.getId());
 		}
 
-		applyUser.setCheckState(jsonObject.getInt("checkState"));
+		applyUser.setAuditStatus(jsonObject.getInt("auditStatus"));
 		applyUser.setCheckOpinion(jsonObject.getStr("checkOpinion"));
 		applyUser.setCheckDate(jsonObject.getDate("checkDate"));
 		applyUser.setType(jsonObject.getInt("type"));
@@ -103,7 +102,7 @@ public class EstateController {
 		applyUser.setCreateType(jsonObject.getInt("createType"));
 		applyUser.setCreateTime(jsonObject.getDate("createDate"));
 		applyUser.setFaceUrl(jsonObject.getStr("faceUrl"));
-		applyUser.setOldImageUri(jsonObject.getStr("oldImageUri"));
+		applyUser.setOldFaceUrl(jsonObject.getStr("oldFaceUrl"));
 		applyUser.setImageMd5(jsonObject.getStr("faceCode"));
 		applyUser.setRecordType(jsonObject.getInt("recordType"));
 		applyUser.setOperatorType(jsonObject.getInt("operatorType"));

blade-service/third/src/main/java/org/springblade/datamigration/controller/PersonDataMigrationController.java

@@ -155,7 +155,7 @@ public class PersonDataMigrationController {
 		Member member = new Member();
 		member.setId(jsonObject.getLong("id"));
 		member.setName(jsonObject.get("name") != null ? jsonObject.getStr("name") : null);
-		member.setTel(jsonObject.get("tel") != null ? jsonObject.getStr("tel") : null);
+		member.setPhone(jsonObject.get("tel") != null ? jsonObject.getStr("tel") : null);
 		member.setTelType(jsonObject.get("telType") != null ? jsonObject.getStr("telType") : null);
 		member.setPassword(jsonObject.get("password") != null ? jsonObject.getStr("password") : null);
 		member.setSex(jsonObject.get("sex") != null ? jsonObject.getInt("sex") : null);

community-app-gateway/src/main/java/org/springblade/app/controller/GuestRecordController.java

@@ -100,7 +100,7 @@ public class GuestRecordController {
 				}
 
 				if(StringUtils.isNotBlank(auditStatus)){
-					guestRecordDTO.setCheckState(Integer.valueOf(auditStatus));
+					guestRecordDTO.setAuditStatus(Integer.valueOf(auditStatus));
 				}
 				guestRecordDTO.setResidentialId(Long.valueOf(residential_id));
 

community-app-gateway/src/main/java/org/springblade/app/controller/HouseUserController.java

@@ -407,9 +407,9 @@ public class HouseUserController {
 					applyUser.setRecordType(OperationConstant.TWO);
 					//修改的属性**********开始*******
 					if (StringUtils.isNotEmpty(applyUser1.getFaceUrl())) {
-						applyUser.setOldImageUri(applyUser1.getFaceUrl());
+						applyUser.setOldFaceUrl(applyUser1.getFaceUrl());
 					} else {
-						applyUser.setOldImageUri(user.getFaceUrl());
+						applyUser.setOldFaceUrl(user.getFaceUrl());
 					}
 					applyUser.setType(Integer.valueOf(type));
 					if (StringUtils.isNotBlank(id_card)) {

community-app-gateway/src/main/java/org/springblade/app/controller/MemberController.java

@@ -24,6 +24,7 @@ import org.springblade.device.entity.DoorDevice;
 import org.springblade.device.feign.IDoorDeviceClient;
 import org.springblade.device.vo.DoorDeviceVO;
 import org.springblade.estate.dto.ApplyUserDTO;
+import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.feign.IApplyUserClient;
@@ -116,7 +117,7 @@ public class MemberController {
 				}
 				//验证手机号是否存在或不存在
 				Member member = new Member();
-				member.setTel(tel);
+				member.setPhone(tel);
 				Member memberCheck = memberClient.detail(member);
 				if (memberCheck != null) {
 					hashMap.put("result_msg", "该手机号已注册");
@@ -203,7 +204,7 @@ public class MemberController {
 			}
 			//一个手机号码只能注册一个会员
 			Member checkMember = new Member();
-			checkMember.setTel(tel);
+			checkMember.setPhone(tel);
 			Member isExist = memberClient.detail(checkMember);
 			//号码已经注册
 			if (isExist != null) {
@@ -229,7 +230,7 @@ public class MemberController {
 			} else {
 				Member member = new Member();
 				member.setName(name);
-				member.setTel(tel);
+				member.setPhone(tel);
 				//create_type : 会员注册来源，0-小程序注册 1-app注册,
 				member.setCreateType(0);
 				member.setOpenid(openid);
@@ -447,7 +448,7 @@ public class MemberController {
 				applyUser.setPhone(phone);
 				//根据姓名和手机号先查找该房屋成员是否已经有memberId，若有使用该成员自己的memberId,没有则使用该业主的memberId
 				Member member = new Member();
-				member.setTel(phone);
+				member.setPhone(phone);
 				member.setName(name);
 				member.setState(CommonConstant.MemberAuditStatus.authed.getValue());
 				MemberVO memberVO = this.memberClient.detail(member);
@@ -533,11 +534,13 @@ public class MemberController {
 			String idCard = applyUserDTO.getIdCard();
 			Assert.isTrue(!(houseUserVO.getName().equals(name) && houseUserVO.getIdCard().equals(idCard)), "该住户已完成认证，请勿重复认证");
 		}
-		boolean authentication = applyUserClient.authentication(applyUserDTO);
-		if(authentication){
-			return R.status(true);
+		if(applyUserDTO.getRecordType() == 0){ //认证
+			return R.status(applyUserClient.authentication(applyUserDTO));
+		}else if(applyUserDTO.getRecordType() == 1){ //添加家人
+			return R.status(applyUserClient.addApplyUserForFamily(applyUserDTO));
+		}else{
+			return R.fail("认证失败，未知住户类型");
 		}
-		return R.status(false);
 	}
 
 

community-app-gateway/src/main/java/org/springblade/app/controller/ResidentialController.java

@@ -91,9 +91,14 @@ public class ResidentialController {
 	@PostMapping(value = "/getResidentialListByMember")
 	public R<List<Residential>> getResidentialListByMember(@RequestBody MemberDTO memberDTO) {
 		Assert.notNull(memberDTO.getId(), "会员必传");
-		List<HouseUserVO> userList = houseUserClient.getListByMember(memberDTO.getId(), memberDTO.getResidentialId(), memberDTO.getRoomId());
+		HouseUser houseUser = new HouseUser();
+		houseUser.setMemberId(memberDTO.getId());
+		List<HouseUserVO> userList = houseUserClient.list(houseUser);
 		List<Long> residentialIdList = userList.stream().map(HouseUser::getResidentialId).distinct().collect(Collectors.toList());
-		List<Residential> residentialList = residentialClient.listByIds(Func.join(residentialIdList));
+		List<Residential> residentialList = new ArrayList<>();
+		if(residentialIdList.size() > 0){
+			residentialList = residentialClient.listByIds(Func.join(residentialIdList));
+		}
 		return R.data(residentialList);
 	}
 }

park-app-gateway/src/main/java/org/springblade/app/controller/DoorDeviceController.java

@@ -61,7 +61,7 @@ public class DoorDeviceController {
 		}else if(userType.intValue() == CommonConstant.UserType.GUEST.getType()){
 			GuestRecord guestRecord = guestRecordClient.getById(Long.valueOf(userId));
 			Assert.notNull(guestRecord, "访客不存在");
-			Assert.isTrue(guestRecord.getCheckState() == 1, "访客未审核通过");
+			Assert.isTrue(guestRecord.getAuditStatus() == 1, "访客未审核通过");
 			deviceUserId = CommonConstant.UserFlag.GUEST_FLAG.getValue() + userId;
 			userName = guestRecord.getGuestName();
 		}else if(userType.intValue() == CommonConstant.UserType.ADMIN.getType()){

park-app-gateway/src/main/java/org/springblade/app/controller/GuestRecordController.java

@@ -63,10 +63,10 @@ public class GuestRecordController {
 			return R.status(guestRecordClient.save(guestRecord));
 		}else{
 			GuestRecord dbGuestRecord = guestRecordClient.getById(id);
-			Assert.notNull(dbGuestRecord.getCheckState(), "审核状态异常");
-			if(dbGuestRecord.getCheckState() == 1){
+			Assert.notNull(dbGuestRecord.getAuditStatus(), "审核状态异常");
+			if(dbGuestRecord.getAuditStatus() == 1){
 				return R.fail("访客记录已审核通过，请勿修改");
-			}else if(dbGuestRecord.getCheckState() == 2){
+			}else if(dbGuestRecord.getAuditStatus() == 2){
 				return R.fail("请勿修改未审核通过记录");
 			}else{
 				return R.status(guestRecordClient.update(guestRecord));
@@ -79,7 +79,7 @@ public class GuestRecordController {
 		List<Long> idList = Func.toLongList(ids);
 		for(Long id : idList){
 			GuestRecord guestRecord = guestRecordClient.getById(id);
-			if(guestRecord.getCheckState() != null && guestRecord.getCheckState() == 0){
+			if(guestRecord.getAuditStatus() != null && guestRecord.getAuditStatus() == 0){
 				guestRecordClient.remove(id.toString());
 			}else{
 				return R.fail("请勿删除已审核记录");
@@ -90,11 +90,11 @@ public class GuestRecordController {
 
 	@PostMapping(value = "/audit")
 	public R audit(@RequestBody GuestRecord guestRecord){
-		Assert.notNull(guestRecord.getCheckState(), "审核状态必传");
+		Assert.notNull(guestRecord.getAuditStatus(), "审核状态必传");
 		GuestRecord dbGuestRecord = guestRecordClient.getById(guestRecord.getId());
 		Assert.notNull(dbGuestRecord, "访客记录不存在");
-		Assert.isTrue(dbGuestRecord.getCheckState() != 1, "访客记录已审核通过");
-		Assert.isTrue(dbGuestRecord.getCheckState() != 2, "访客记录已审核不通过");
+		Assert.isTrue(dbGuestRecord.getAuditStatus() != 1, "访客记录已审核通过");
+		Assert.isTrue(dbGuestRecord.getAuditStatus() != 2, "访客记录已审核不通过");
 		return guestRecordClient.audit(guestRecord);
 	}
 }