diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java index 144eb5b..f13633e 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java @@ -136,18 +136,18 @@ public class AquUserController extends BaseController { if (userId == null || userId < 0) { return R.fail("用户未登录"); } - + // 查询用户的报警电话 JSON字段 AquUserVo user = aquUserService.queryById(userId); if (user == null) { return R.fail("用户不存在"); } - + String warnPhoneJson = user.getWarnPhoneJson(); if (StringUtils.isEmpty(warnPhoneJson)) { return R.fail("不存在报警电话列表"); } - + // 反序列化JSON为List try { List warnPhones = JsonUtils.parseArray(warnPhoneJson, String.class); @@ -156,7 +156,7 @@ public class AquUserController extends BaseController { return R.fail("报警电话数据格式错误"); } } - + /** * 获取子用户列表 * @@ -169,10 +169,10 @@ public class AquUserController extends BaseController { if (userId == null || userId < 0) { return R.fail("用户未登录"); } - + // 查询该用户的所有子账号 List list = userRelationMapper.selectChildUsersByParentId(userId); - + return R.ok(list); } @@ -188,10 +188,10 @@ public class AquUserController extends BaseController { if (userId == null || userId < 0) { return R.fail("用户未登录"); } - + // 查询该用户的所有父账号 List list = userRelationMapper.selectParentUsersByChildId(userId); - + return R.ok(list); } @@ -215,11 +215,11 @@ public class AquUserController extends BaseController { .eq(AquUser::getMobilePhone, request.getMobilePhone()) .select(AquUser::getId) ); - + if (childUser == null) { - return R.fail("该手机号用户不存在"); + return R.fail("该手机号还未注册小程序,请先注册"); } - + Long childUserId = childUser.getId(); // 检查是否已存在该子账号关系 @@ -228,7 +228,7 @@ public class AquUserController extends BaseController { .eq(UserRelation::getParentUserId, userId) .eq(UserRelation::getChildUserId, childUserId) ); - + if (count > 0) { return R.fail("子账号已添加,无需重复添加"); }