zqy
2024-06-23 a69aafe60ce001834b981778f12fd74d4af77e23
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -86,11 +86,7 @@
        //加上自己家庭的id
        idList.add(familyId);
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        //查看别人分享
        List<ZfDoctor> bs = zfDoctorShareService.listUserId(myself.getUserId());
//        String secondFamilyAuthority = listSecondFamilyIds()
        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor, idList);
        Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
@@ -99,7 +95,6 @@
        List<ZfDoctor> beanRecords = pageResult.getRecords();//得到查询出来的数据
        List<ZfDoctor> dtoResult = markOwnData(familyId, beanRecords);
        dtoResult.addAll(bs);
        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
    }
@@ -121,12 +116,9 @@
        //加上自己家庭的id
        idList.add(familyId);
        //查看别人分享
        List<ZfDoctor> bs = zfDoctorShareService.listUserId(myself.getUserId());
        LambdaQueryWrapper<ZfDoctor> lambdaQueryWrapper = buildCondition(zfDoctor, idList);
        List<ZfDoctor> beanRecords = list(lambdaQueryWrapper);
        beanRecords.addAll(bs);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
    }
@@ -166,10 +158,13 @@
        for (ZfDoctor zfDoctor : dataList) {
            if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
            if (zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null) {
                throw new RuntimeException("症状为空,导入数据失败");
            } else {
                }
                else {
                zfDoctorService.addData(zfDoctor);
                }
            }
        }
        return AjaxResult.success("导入数据成功");
@@ -191,7 +186,7 @@
//        List<ZfDoctorShare> authority1 = zfDoctorShareService.getAuthority();
//        List<Long> idList1 = authority1.stream().filter(auth -> auth.getShareContent().toString().equals(DOCTOR_LIST)).map(ZfDoctorShare::getShareId).collect(Collectors.toList());
        zfDoctorService.addData(zfDoctor);
//        zfDoctorService.addData(zfDoctor);
        if (zfDoctor.getFamilyId() != null && !familyIdList.contains(zfDoctor.getFamilyId())) {
            throw new RuntimeException("你没有权限操作此家庭的数据");