修改分享bug

zqy

2024-07-21 94b1a3bde93ad87f9347d8a08d70dd4f2318f1ce

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

@@ -148,6 +148,7 @@
        us.setRoleId(user.getRoleId());
        us.setSex(user.getSex());
        us.setStatus(user.getStatus());
        us.setRemark(user.getRemark());
        userService.updateUser(us);

  //      System.out.println(user.getFamilyId());
@@ -159,6 +160,7 @@
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setMomId(user.getMid());
        infoUser.setFatherId(user.getFid());
        infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());
        if(user.getSpouseId()!=null) {
@@ -182,12 +184,12 @@
                System.out.println("2222222222222222222222222222222222/");
            infoUser.setFamilyId(mother.getFamilyId());
        }
//        else if (user.getSpouseId()!=null) {
//            ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
//            System.out.println("33333333333333333333333333333333333333333/");
//            infoUser.setFamilyId(spouse.getFamilyId());
//            infoUser.setSpouseId(user.getSpouseId());
//        }
        else if (user.getSpouseId()!=null) {
            ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
            System.out.println("33333333333333333333333333333333333333333/");
            infoUser.setFamilyId(spouse.getFamilyId());
            infoUser.setSpouseId(user.getSpouseId());
        }

        zInfoUserService.saveOrUpdate(infoUser);
        if(user.getSpouseId()!=null) {
@@ -279,13 +281,13 @@
            ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
            if (father.getIsMyFamily() == 1)
                infoUser.setFamilyId(father.getFamilyId());
            if (mother.getIsMyFamily() == 1)
            else if (mother.getIsMyFamily() == 1)
                infoUser.setFamilyId(mother.getFamilyId());
        }
//        else {
//            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
//            infoUser.setFamilyId(spouse.getFamilyId());
//        }
        else {
            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
            infoUser.setFamilyId(spouse.getFamilyId());
        }

        //前端保证了角色不为空
     //   if(user.getRoleIds()[0]==102)