ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -344,6 +344,13 @@ // System.out.println(userAll.getIsMyFamily()); infoUser.setIsMyFamily(userAll.getIsMyFamily()); if(userAll.getIsMyFamily()==1) { ZfFamily zfFamily = new ZfFamily(); zfFamily.setName(userAll.getNickName()+"的家庭"); zfFamilyService.addFamily(zfFamily); infoUser.setFamilyId(zfFamily.getId()); } // if(userAll.getSpouseId()==0) // infoUser.setSpouseId(null); // else { @@ -353,12 +360,13 @@ if (userAll.getFid() != null && userAll.getMid() != null){ ZInfoUser father = zInfoUserService.getById(userAll.getFid()); ZInfoUser mother = zInfoUserService.getById(userAll.getMid()); //如果是本家，就简历一个家庭号 if (father.getIsMyFamily() == 1){ infoUser.setFamilyId(father.getFamilyId()); // infoUser.setFamilyId(father.getFamilyId()); infoUser.setClanId(father.getClanId()); } else if (mother.getIsMyFamily() == 1){ infoUser.setFamilyId(mother.getFamilyId()); // infoUser.setFamilyId(mother.getFamilyId()); infoUser.setClanId(mother.getClanId()); } zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -296,7 +296,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //加上自己家庭的id idList.add(familyId); zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -706,8 +706,16 @@ ZInfoUser user = getInfoBysysId(userId); if(user!=null) { if(user==null) { //利用userId查询 LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getUserId, userId); List<ZInfoUser> list = list(lqw); user = list.get(0); } Long familyId = user.getFamilyId(); // System.out.println("dddddddddddddddddddd"); if(user.getRoleId()==null) @@ -715,19 +723,6 @@ String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName); // System.out.println("dddddddddddddddddddd"); // System.out.println(familyId); // if(familyId!=null&&familyId!=-1) // { // String familyName = zfFamilyService.getById(familyId).getName(); // user.setFamilyName(familyName); // } } else{ //查询sys_user表 } return user; }
@@ -326,11 +326,10 @@ //查看父母的数据： Long fatherFaId = 0L; if(myself.getFatherId()!=null) System.out.println("1111111111111111111"); fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -328,7 +328,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -310,7 +310,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -90,7 +90,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -313,7 +313,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -313,7 +313,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList()); zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -293,14 +293,15 @@ Long familyId = myself.getFamilyId(); System.out.println("++++++++++++++++"); System.out.println(familyId); System.out.println(myself.getFatherId()); System.out.println(zInfoUserService.getInfoById(myself.getFatherId())); //查看父母的数据： Long fatherFaId = 0L; if(myself.getFatherId()!=null) fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority(); zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -79,7 +79,7 @@ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); Long motherFaId = 0L; if(myself.getMomId()!=null) motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); //也要查别人授权的 List<ZAuthority> authority = zAuthorityService.getAuthority();
