Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-21 18538331d89918f14be0483e24e9beabf9fbce00

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

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

@@ -98,8 +98,18 @@
        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        if (user != null)
        {
            user.setPassword(config.getPassword());
            user.setDepartmentId(config.getDepartmentId());
            user.setUserName(config.getUserName());
            user.setPhonenumber(config.getPhonenumber());
            user.setLoginName(config.getLoginName());
            user.setMasterIds(config.getMasterIds());
            user.setRoleIds(2+"");
            user.setUserType("2");
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
            return ResultData.error("该手机号已注册账户！请更换");
            return toAjax(IUserService.updateConfig(user));
        }
        config.setRoleIds(2+"");
        config.setCreateTime(LocalDateTime.now());