修改

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

@@ -99,7 +99,8 @@ public class GuestRecordController extends BladeController {
 	public R<IPage<GuestRecordVO>> list(@RequestParam Map<String, Object> guestRecord, Query query, BladeUser bladeUser) {
 		QueryWrapper<GuestRecord> queryWrapper = Condition.getQueryWrapper(guestRecord, GuestRecord.class);
 		queryWrapper.lambda().orderByDesc(GuestRecord::getCreateTime);
-		IPage<GuestRecord> pages = guestRecordService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(GuestRecord::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		queryWrapper.lambda().eq(GuestRecord::getAuditStatus,1);
+		IPage<GuestRecord> pages = guestRecordService.page(Condition.getPage(query), queryWrapper);
 		return R.data(GuestRecordWrapper.build().pageVO(pages));
 	}
 

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

@@ -41,10 +41,7 @@ import org.springblade.estate.entity.ServerUser;
 import org.springblade.estate.entity.SnapRecord;
 import org.springblade.estate.entity.UserAccessPermissions;
 import org.springblade.estate.mapper.UserAccessPermissionsMapper;
-import org.springblade.estate.service.IGuestRecordService;
-import org.springblade.estate.service.IServerUserService;
-import org.springblade.estate.service.ISnapRecordService;
-import org.springblade.estate.service.IUserAccessPermissionsService;
+import org.springblade.estate.service.*;
 import org.springblade.estate.vo.UserAccessPermissionsVO;
 import org.springblade.estate.vo.UserFacePermissionsStatisticsVO;
 import org.springblade.estate.wrapper.UserAccessPermissionsWrapper;
@@ -79,6 +76,7 @@ public class UserFacePermissionsController extends BladeController {
 	private final IServerUserService serverUserService;
 	private final ISnapRecordService snapRecordService;
 	private final ISysClient sysClient;
+	private final IApplyUserService applyUserService;
 
 	/**
 	 * 【web端】人脸权限 数据统计
@@ -169,11 +167,12 @@ public class UserFacePermissionsController extends BladeController {
 	private UserFacePermissionsStatisticsVO getHouseUserStatisticsVO() {
 		//获取已下发的id列表
 //		List<Long> ids = userAccessPermissionsService.getUserIdsByUserType(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
-		//待审核
-		HouseUser houseUser = new HouseUser();
-		houseUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
-		Integer waitCount = houseUserClient.houseUserCount(houseUser);
+		//待审核  查apply_user表
+		Integer waitCount = applyUserService.applyUserCount();
+//		houseUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
+//		Integer waitCount = houseUserClient.houseUserCount(houseUser);
 		//已审核
+		HouseUser houseUser = new HouseUser();
 		houseUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 		Integer passCount = houseUserClient.houseUserCount(houseUser);
 		//已下发 住户审核通过并且下发成功face_enable=1

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

@@ -63,4 +63,10 @@ public interface IApplyUserService extends BaseService<ApplyUser> {
 	 * @return
 	 */
 	R updateAuditStatus(ApplyUserDTO applyUserDTO);
+
+	/**
+	 * 查询待审核的数量
+	 * @return
+	 */
+	Integer applyUserCount();
 }

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.estate.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.OperationConstant;
@@ -460,4 +462,15 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		}
 	}
 
+	/**
+	 * 查询待审核的数量
+	 * @return
+	 */
+	@Override
+	public Integer applyUserCount(){
+		LambdaQueryWrapper<ApplyUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(ApplyUser::getAuditStatus,0);
+		return this.baseMapper.selectCount(lambdaQueryWrapper);
+	}
+
 }

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

@@ -42,9 +42,12 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.enterprise.vo.ChartDataVO;
 import org.springblade.enterprise.vo.EnterpriseBizTypePieDataVO;
+import org.springblade.estate.dto.ApplyUserDTO;
 import org.springblade.estate.dto.AuthorizeRecordsDTO;
 import org.springblade.estate.dto.UserAccessPermissionsDTO;
+import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.entity.UserAccessPermissions;
+import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.estate.vo.UserAccessPermissionsVO;
 import org.springblade.person.dto.HouseUserDTO;
@@ -99,6 +102,7 @@ public class HouseUserController extends BladeController {
 	private final IConfClient confClient;
 	private final IUserAccessPermissionsClient userAccessPermissionsClient;
 	private final IDictBizClient dictBizClient;
+	private final IApplyUserClient applyUserClient;
 
 
 	/**