From 76561071d3441cd8a551772d0f43d93c9f9a1e6a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 十月 2024 18:08:25 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
index fcb3bce..3acfe2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
@@ -72,11 +72,7 @@
user.setPhonenumber(dto.getAccount());
if (!userService.checkUserNameUnique(user))
{
- return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+ return error("添加用户'" + user.getUserName() + "'失败，登录账号已存在");
}
shopService.save(dto);
// 添加账号
@@ -95,13 +91,10 @@
SysUser user = new SysUser();
user.setUserName(dto.getAccount());
user.setPhonenumber(dto.getAccount());
+ user.setUserId(dto.getUserId());
if (!userService.checkUserNameUnique(user))
{
return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
shopService.updateById(dto);
userService.updateAccount(dto);
--
Gitblit v1.7.1