From 5bfe4069d574bd1fd0b1f29f86653f2bdffaccd7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 16:00:54 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index b4965b7..4780d71 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -679,7 +679,7 @@
@ResponseBody
@PostMapping("/addSysUser")
@Transactional(rollbackFor = Exception.class)
- public R addSysUser(@RequestBody SysUser user){
+ public R addSysUser(@RequestBody SysUser user) {
System.err.println("事务ID：" + RootContext.getXID());
if(StringUtils.isEmpty(user.getUserName())){
user.setUserName(user.getPhonenumber());
@@ -688,10 +688,10 @@
user.setNickName(user.getPhonenumber());
}
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- return R.fail("手机号已开通账号");
+ throw new RuntimeException("手机号已开通账号");
}
if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
- return R.fail("登录账号已存在");
+ throw new RuntimeException("登录账号已存在");
}
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
--
Gitblit v1.7.1