无关风月
2024-06-17 e6a9a810a0cbe66bb02de96588ac6c5057047f41
bug修改
2个文件已修改
20 ■■■■ 已修改文件
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/pom.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -127,9 +128,13 @@
    public AjaxResult addCompanyUser(@Validated @RequestBody AddCompanyUserDto dto) {
        SysUser user = new SysUser();
        user.setDeptId(dto.getDeptId());
        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
        List<SysUser> list = userService.list(new QueryWrapper<SysUser>()
                .eq("del_flag", 0)
                .eq("phonenumber", dto.getPhonenumber()));
        if (!list.isEmpty()){
            return error("手机号已存在,请重新输入");
        }
        user.setPhonenumber(dto.getPhonenumber());
        user.setNickName(dto.getNickName());
        user.setCreateBy(SecurityUtils.getUsername());
@@ -173,9 +178,12 @@
        user.setNickName(nickName);
        user.setDeptId(deptId);
        user.setPhonenumber(phonenumber);
        SysUser byId = userService.getById(dto.getUserId());
        if (!byId.getPhonenumber().equals(phonenumber)){
        if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
            return error("手机号已存在,请重新输入");
        }
        }
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
ruoyi-service/ruoyi-study/pom.xml
@@ -22,11 +22,11 @@
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud.sdk</groupId>
            <artifactId>huaweicloud-sdk-bundle</artifactId>
            <version>3.1.87</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.huaweicloud.sdk</groupId>-->
<!--            <artifactId>huaweicloud-sdk-bundle</artifactId>-->
<!--            <version>3.1.87</version>-->
<!--        </dependency>-->
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>