修改删除导办人员账户转为小程序用户 bug

lidongdong

2022-11-01 dfa7d7c11b2aa81c9ce9b6795638f4e8baa76e49

修改删除导办人员账户转为小程序用户  bug

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -275,6 +275,10 @@
    @Authorization
    public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
    {
        if(ids==null || ids.size()<1)
        {
            ids=null;
        }
        return getDataTable(iTransactionEventService.selectClassifyList(ids));
    }


 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -118,6 +118,12 @@
        }
        else
        {
            if(StringUtils.equals("4",user.getUserType()))
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "账户不存在");
            }

            if(!password.equals(user.getPassword()))
            {
                //提示用户名或密码错误
@@ -229,17 +235,44 @@
            return error("手机号不能为空");
        }




        SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
        SysUser user2 = IUserService.selectData("","",config.getLoginName());
        if (user != null) {
            //提示用户名或密码错误
            return error("该用户已存在！");
            if(StringUtils.equals("4",user.getUserType()))
            {
                config.setUserId(user.getUserId());
                config.setCreateBy(user.getUserId()+"");
                config.setUserType("3");

                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
            else
            {
                //提示用户名或密码错误
                return error("该用户已存在！");
            }
        }

        if(user2 != null)
        {
            //提示用户名或密码错误
            return error("该登录账户已存在！请修改登录账户");
            if(StringUtils.equals("4",user2.getUserType()))
            {
                config.setUserId(user2.getUserId());
                config.setCreateBy(user2.getUserId()+"");
                config.setUserType("3");

                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
            else
            {
                //提示用户名或密码错误
                return error("该用户已存在！");
            }
        }

        config.setCreateBy(sysUser.getUserId()+"");