feige
2024-10-27 bc74ffaaa0074a96d7e7e60838845d020f94f347
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -706,28 +706,25 @@
        ZInfoUser user = getInfoBysysId(userId);
        if(user!=null)
        {
            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);
//            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表
        if(user==null) {
            //利用userId查询
            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
            lqw.eq(ZInfoUser::getUserId, userId);
            List<ZInfoUser> list = list(lqw);
            if(list.size()>0)
                user = list.get(0);
            else
                return null;
        }
        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);
        return user;
    }