From 160b28e441dd7b6c08519544b7fc33992af421fa Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 20 Apr 2026 12:56:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=90=E8=B4=A6=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fishery/controller/AquUserController.java | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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<String>
         try {
             List<String> 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<UserChildVo> 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<UserChildVo> 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("子账号已添加，无需重复添加");
         }