修改

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

@@ -124,6 +124,7 @@ public class GuestRecordController extends BladeController {
 			guestRecord.setFaceUrl(confClient.removePrefix(guestRecord.getFaceUrl()));
 		}
 		guestRecord.setAuditStatus(1);
+		guestRecord.setRegisterSource(2);
 		boolean save = guestRecordService.save(guestRecord);
 		if(save){
 			if(guestRecord.getAuditStatus() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())){

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

@@ -177,7 +177,10 @@ public class HouseUserController extends BladeController {
 	public R update(@Valid @RequestBody HouseUser houseUser) {
 		Assert.hasText(houseUser.getIdCard(), "身份证号必传");
 		Assert.notNull(houseUser.getRoomId(),"房间id不能为空");
-		Assert.isTrue(!houseUserService.judgeHaveHouseUser(houseUser.getIdCard(),houseUser.getRoomId()),"同一个房间下不能存在相同身份住户");
+		HouseUser houseUser1 = houseUserService.getById(houseUser.getId());
+		if (!StringUtil.isEmpty(houseUser1.getIdCard()) && !houseUser.getIdCard().equals(houseUser1.getIdCard())){
+			Assert.isTrue(!houseUserService.judgeHaveHouseUser(houseUser.getIdCard(),houseUser.getRoomId()),"同一个房间下不能存在相同身份住户");
+		}
 		String faceUrl = houseUser.getFaceUrl();
 		if (StrUtil.isNotBlank(faceUrl)) {
 			houseUser.setFaceUrl(confClient.removePrefix(houseUser.getFaceUrl()));