From d7a97b8520a3cf0dd174ddda5669ef68a2a6b018 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期二, 10 九月 2024 21:56:33 +0800 Subject: [PATCH] 修改保洁收纳&通讯录的导入,新增直播删除 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java index 0e3a51b..dca8db9 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java @@ -48,6 +48,7 @@ @Resource private ZfFamilyService zfFamilyService; + @Resource private ZfRoleService zfRoleService; @@ -103,9 +104,10 @@ @Override - public List<ZInfoUser> getDataBySex(Integer sex){ + public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getSex, sex); + lqw.eq(ZInfoUser::getClanId, clanId); List<ZInfoUser> list = list(lqw); return list; } @@ -680,7 +682,8 @@ { Long familyId = user.getFamilyId(); // System.out.println("dddddddddddddddddddd"); - + if(user.getRoleId()==null) + user.setRoleId(3L); String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName); @@ -692,6 +695,11 @@ // user.setFamilyName(familyName); // } } + else{ + //鏌ヨsys_user琛� + + + } return user; } -- Gitblit v1.9.1