From bed6becab65745585281ba2e499fa39de561c29f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 16:47:28 +0800
Subject: [PATCH] 提交管理后台部分接口

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java |   19 +++----------------
 1 files changed, 3 insertions(+), 16 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 28d1593..dac579f 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
@@ -356,7 +356,7 @@
     }
 
     @PostMapping("/updateSysUser")
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class)
     public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
         try {
             sysUser.setUpdateBy(SecurityUtils.getUsername());
@@ -675,19 +675,6 @@
                 .last("LIMIT 1"));
         return R.ok(user);
     }
-    
-    /**
-     * 根据账号获取用户数据
-     * @param account
-     * @return
-     */
-    @PostMapping("/queryUserByAccount")
-    public R<SysUser>  queryUserByAccount(@RequestBody String account){
-        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
-                .eq(SysUser::getAccount, account)
-                .eq(SysUser::getDelFlag, "0"));
-        return R.ok(user);
-    }
 
 
     /**
@@ -711,7 +698,7 @@
      */
     @ResponseBody
     @PostMapping("/addSysUser")
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class)
     public R addSysUser(@RequestBody SysUser user){
         user.setUserName(user.getPhonenumber());
         if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
@@ -720,7 +707,7 @@
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             throw new RuntimeException("手机号已开通账号");
         }
-        if (StringUtils.isNotEmpty(user.getAccount()) && !userService.checkAccountUnique(user)) {
+        if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
             throw new RuntimeException("登录账号已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());

--
Gitblit v1.7.1