修改分页查询

zqy

2024-07-16 9a4b09e6a32b4510e1e9c4fb13d6cb90b896abe4

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

@@ -160,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) {
@@ -183,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) {
@@ -280,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)