bug修改

无关风月

2024-06-28 a79996fedf6be3af3292495d394e0f0250b71d4c

 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,7 +178,12 @@
        user.setNickName(nickName);
        user.setDeptId(deptId);
        user.setPhonenumber(phonenumber);
        if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
        user.setUserId(dto.getUserId());
        List<SysUser> list = userService.list(new QueryWrapper<SysUser>()
                .eq("del_flag", 0)
                .ne("user_id",dto.getUserId())
                .eq("phonenumber", dto.getPhonenumber()));
        if (!list.isEmpty()){
            return error("手机号已存在，请重新输入");
        }
        user.setUserName(user.getPhonenumber());