修改了bug

feige

2024-11-05 72f21494ba48e573e68007eab2296f8c25ecc4b7

修改了bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -32,6 +32,8 @@
//        {
//            return error("当前系统没有开启注册功能！");
//        }
        System.out.println(user);
     //   String msg = "";
        String msg = registerService.register(user);
        return StringUtils.isEmpty(msg) ? success() : error(msg);
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -144,7 +144,7 @@
            SysUser sysUser = userService.selectUserById(userId);
            ajax.put(AjaxResult.DATA_TAG, sysUser);
            ajax.put("postIds", postService.selectPostListByUserId(userId));
            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
//            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
        }
        return ajax;
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
@@ -156,8 +157,12 @@
//        }
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zInfoUser.setUserId(userId);
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
        zInfoUser.setSysId(userId);

        LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
        uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.update(uw));
            //    saveOrUpdate(zInfoUser));
    }



 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -73,10 +73,10 @@
    private Date loginDate;

    /** 部门对象 */
    @Excels({
        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
    })
//    @Excels({
//        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
//        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
//    })
    private SysDept dept;

    /** 角色对象 */

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -7,6 +7,16 @@
 */
public class LoginBody
{
    @Override
    public String toString() {
        return "LoginBody{" +
                "username='" + username + '\'' +
                ", nickname='" + nickname + '\'' +
                ", password='" + password + '\'' +
                ", code='" + code + '\'' +
                ", uuid='" + uuid + '\'' +
                '}';
    }

    public String getNickname() {
        return nickname;

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -44,10 +44,13 @@
     */
    public String register(RegisterBody registerBody)
    {
        String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
        String msg = "", username = registerBody.getNickname(), password = registerBody.getPassword();
        SysUser sysUser = new SysUser();
        sysUser.setUserName(username);
//        System.out.println(username);
//        System.out.println("+++++++++++++++++++++==");

        sysUser.setNickName(username);
        sysUser.setUserName(username);
        // 验证码开关
        boolean captchaEnabled = configService.selectCaptchaEnabled();
        if (captchaEnabled)
@@ -73,7 +76,7 @@
        {
            msg = "密码长度必须在5到20个字符之间";
        }
        else if (!userService.checkUserNameUnique(sysUser))
        else if (!userService.checkNickNameUnique(sysUser))
        {
            msg = "保存用户'" + username + "'失败，注册账号已存在";
        }

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -149,6 +149,12 @@

    @Excel(name = "是否是本家庭成员",readConverterExp = "0=否,1=是")
    private Integer isMyFamily;
    /**
     * 自我介绍
     */

    @Excel(name = "自我介绍")
    private String selfIntroduction;

    @TableField(exist = false)
    private String familyName;
@@ -223,10 +229,7 @@
     */
    private String secondFamilyId;

    /**
     * 自我介绍
     */
    private String selfIntroduction;

    private Long sysId;
    /**
     * 代数

 zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java

@@ -35,11 +35,11 @@
    /**
     * 家庭名称
     */
    @Excel(name="父亲id")
//    @Excel(name="父亲id")

    private Long fid;

    @Excel(name="母亲id")
//    @Excel(name="母亲id")
    private Long mid;



 zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java

@@ -27,7 +27,7 @@
        lqw.eq(ZHealthNote::getUid,userId);
        ZHealthNote result = getOne(lqw);
        if(result == null){
            throw new RuntimeException("请先填写好数据");
            throw new RuntimeException("请先填写好生活习惯数据！");
        }

        return AjaxResult.success(result);