Merge branch 'feature_asset'

mitao

3 天以前 f409bb23163dfa6c3f0508f6b90a1caacc7b9518

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -160,6 +160,7 @@
        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        user.setUserName(user.getPhonenumber());
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        userService.insertUser(user);
@@ -257,7 +258,7 @@
        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }

        user.setUserName(user.getPhonenumber());
        user.setUpdateBy(getUsername());
        if (StringUtils.isNotEmpty(user.getPassword())) {
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));