huangmp 4 tahun lalu
induk
melakukan
822f682a14

+ 56 - 51
blade-service-api/person-api/src/main/java/org/springblade/person/feign/HouseUserClientFallback.java

@@ -20,28 +20,33 @@ import java.util.Map;
 
 @Component
 public class HouseUserClientFallback implements IHouseUserClient {
-            /**
-         * 详情
-         */
-        @Override
-        public HouseUserVO detail(HouseUser houseUser) {
-            return null;
-        }
-
-        /**
-         * 查询
-         */
-        @Override
-        public List<HouseUserVO> list(HouseUser houseUser) {
-            return new ArrayList<>();
-        }
+	@Override
+	public Boolean logout(Long memberId) {
+		return false;
+	}
+
+	/**
+	 * 详情
+	 */
+	@Override
+	public HouseUserVO detail(HouseUser houseUser) {
+		return null;
+	}
+
+	/**
+	 * 查询
+	 */
+	@Override
+	public List<HouseUserVO> list(HouseUser houseUser) {
+		return new ArrayList<>();
+	}
 
 	@Override
 	public List<HouseUser> listInRoomIds(List<Long> roomIds) {
 		return null;
 	}
 
-    @Override
+	@Override
 	public List<HouseUserVO> listMap(Map<String, Object> houseUser) {
 		return new ArrayList<>();
 	}
@@ -58,37 +63,37 @@ public class HouseUserClientFallback implements IHouseUserClient {
 
 
 	/**
-         * 新增
-         */
-        @Override
-        public boolean save( HouseUser houseUser) {
-            return false;
-        }
-
-        /**
-         * 修改
-         */
-        @Override
-        public boolean update( HouseUser houseUser) {
-            return false;
-        }
-
-        /**
-         * 新增或修改
-         */
-        @Override
-        public boolean submit( HouseUser houseUser) {
-            return false;
-        }
-
-
-        /**
-         * 删除
-         */
-        @Override
-        public boolean remove( String ids) {
-            return false;
-        }
+	 * 新增
+	 */
+	@Override
+	public boolean save(HouseUser houseUser) {
+		return false;
+	}
+
+	/**
+	 * 修改
+	 */
+	@Override
+	public boolean update(HouseUser houseUser) {
+		return false;
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@Override
+	public boolean submit(HouseUser houseUser) {
+		return false;
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@Override
+	public boolean remove(String ids) {
+		return false;
+	}
 
 	@Override
 	public boolean deleteUserAndRelationship(HouseUserDTO userDto) {
@@ -115,10 +120,10 @@ public class HouseUserClientFallback implements IHouseUserClient {
 		return null;
 	}
 
-    @Override
-    public int count(@Valid HouseUser houseUser) {
-        return 0;
-    }
+	@Override
+	public int count(@Valid HouseUser houseUser) {
+		return 0;
+	}
 
 	@Override
 	public List<HouseUserVO> getListByMember(Long memberId, Long residentialId, Long roomId) {

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

@@ -73,17 +73,17 @@ public class HouseUserController {
 		houseUser.setMemberId(memberId);
 		List<HouseUserVO> houseUserVOS = houseUserClient.list(houseUser);
 		if (CollUtil.isEmpty(houseUserVOS)) {
-			return R.status(false);
+			return R.data(false);
 		}
 		List<Long> roomIds = houseUserVOS.stream().map(HouseUser::getRoomId).collect(Collectors.toList());
 		if (CollUtil.isEmpty(roomIds)) {
-			return R.status(false);
+			return R.data(false);
 		}
 		List<HouseUser> users = houseUserClient.listInRoomIds(roomIds);
 		if (CollUtil.isEmpty(users)) {
-			return R.status(false);
+			return R.data(false);
 		}
-		return R.status(true);
+		return R.data(true);
 	}
 
 	/**