lidongdong
2022-10-21 c4509a367111dd34cbeac48c47ff3d926d370289
修改添加用户登录账户重复 bug
5个文件已修改
36 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/UserController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/ISysUserService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -64,7 +64,7 @@
            }
            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
@@ -81,7 +81,7 @@
                IUserService.insertConfig(newSysUser);
            }
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
            if (user == null) {
                return ResultData.error("用户不存在!请联系管理员");
@@ -222,12 +222,18 @@
            return error("手机号不能为空");
        }
        SysUser user = IUserService.selectData("",config.getPhonenumber());
        SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
        SysUser user2 = IUserService.selectData("","",config.getLoginName());
        if (user != null) {
            //提示用户名或密码错误
            return error("该账户已存在!");
            return error("该用户已存在!");
        }
        if(user2 != null)
        {
            //提示用户名或密码错误
            return error("该登录账户已存在!请修改登录账户");
        }
        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId()+"");
@@ -301,7 +307,7 @@
            return error("userId不能为空");
        }
        SysUser sysUser=IUserService.selectData(userId,null);
        SysUser sysUser=IUserService.selectData(userId,null,null);
        //删除标志(0代表存在 2代表删除)
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -329,7 +335,7 @@
            return error("密码不能为空");
        }
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null,null);
        if(sysUser==null)
        {
            return error("用户不存在");
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -32,7 +32,9 @@
    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
    SysUser selectData(@Param("userId") String userId,
                       @Param("phonenumber") String phonenumber,
                       @Param("loginName") String loginName);
    /**
flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -17,7 +17,7 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);
    SysUser selectData(String userId,String phonenumber);
    SysUser selectData(String userId,String phonenumber,String loginName);
    /**
     * 新增聊天记录
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -245,8 +245,8 @@
    }
    @Override
    public SysUser selectData(String userId,String phonenumber) {
        return baseMapper.selectData(userId,phonenumber);
    public SysUser selectData(String userId,String phonenumber,String loginName) {
        return baseMapper.selectData(userId,phonenumber,loginName);
    }
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -143,11 +143,15 @@
        <include refid="selectSysUserVo"/>
        <where>
            <if test="userId!=null and userId!='' ">
                user_id= #{userId}
                AND user_id= #{userId}
            </if>
            <if test="phonenumber!=null and phonenumber!='' ">
                phonenumber= #{phonenumber}
                AND phonenumber= #{phonenumber}
            </if>
            <if test="loginName!=null and loginName!='' ">
                AND login_name= #{loginName}
            </if>
        </where>