|
|
@@ -305,7 +305,7 @@ public class AdminController {
|
|
|
// 获取用户的家庭 ID,只返回该家庭的模板
|
|
|
com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
|
|
|
if (user == null || user.getFamilyId() == null) {
|
|
|
- return Result.error("用户必须属于某个家庭");
|
|
|
+ return Result.noFamily("请先创建或加入家庭");
|
|
|
}
|
|
|
|
|
|
return Result.success(rewardMapper.selectList(new LambdaQueryWrapper<Reward>()
|
|
|
@@ -318,7 +318,7 @@ public class AdminController {
|
|
|
// 强制关联家庭
|
|
|
com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
|
|
|
if (user == null || user.getFamilyId() == null) {
|
|
|
- return Result.error("用户必须属于某个家庭");
|
|
|
+ return Result.noFamily("请先创建或加入家庭");
|
|
|
}
|
|
|
|
|
|
reward.setFamilyId(user.getFamilyId());
|
|
|
@@ -348,7 +348,7 @@ public class AdminController {
|
|
|
// 验证家庭归属
|
|
|
com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
|
|
|
if (user == null || user.getFamilyId() == null) {
|
|
|
- return Result.error("用户必须属于某个家庭");
|
|
|
+ return Result.noFamily("请先创建或加入家庭");
|
|
|
}
|
|
|
|
|
|
Reward existingReward = rewardMapper.selectById(id);
|