修改家谱bug

zengqinyu

2025-04-22 c119927474106ead6513f830b02bceea98dc9cde

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

@@ -193,7 +193,7 @@
        //System.out.println(sysUserRole.getRoleId());
        System.out.println("你好呀");
        System.out.println(user.getRoleId());
        if (user.getRoleId().equals(102L)){
        if (user.getRoleId() != null && user.getRoleId().equals(102L)){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
@@ -201,7 +201,7 @@
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setMomId(user.getMid());
        infoUser.setFatherId(user.getFid());
        infoUser.setSex(Integer.valueOf(user.getSex()));
        if (user.getSex() != null)infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());

@@ -214,7 +214,8 @@
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());

            Long myFamily = zInfoUserService.getById(user).getFamilyId();
        if (myFamily != null) infoUser.setFamilyId(myFamily);
            if (user.getFid() != null){
            //跟随父亲的家族和家庭信息
          //   if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
@@ -261,11 +262,11 @@


        }
        if(infoUser.getFamilyId()!=null)
        if(infoUser.getFamilyId() != null)
            zInfoUserService.saveOrUpdate(infoUser);
        else {
            System.out.println("家庭成员不能修改为普通用户");
            return AjaxResult.success("家庭成员不能修改为普通用户");
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }
        //更新配偶信息
        if(user.getSpouseId()!=null) {
@@ -306,7 +307,7 @@
        }
        else {
            System.out.println("daniuni");
            return AjaxResult.success("家庭成员不能修改为普通用户");
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }

      //  zInfoUserService.update(infoUser);