修改导入判断

zqy

2024-09-23 b255f2a8bb78bb5197c8b839853682203c8a1ddc

 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,12 +158,15 @@


        for (ZfDoctor zfDoctor : dataList) {
            if (zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null) {
                throw new RuntimeException("症状为空，导入数据失败");
            } else {
                zfDoctorService.addData(zfDoctor);
//            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 {
                    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("你没有权限操作此家庭的数据");
@@ -444,6 +439,31 @@
        return lqw;
    }

//    public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
//        LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();
//            lqw.eq(ZfDoctor::getId, ids);
//
//        return lqw;
//    }
//    @Override
//    public AjaxResult selectListById(List<Long> ids, Integer pageNum, Integer pageSize) {
//        List<ZfDoctor> lqw2 = new ArrayList<>();
//
//        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition2(ids);
//        List<ZfDoctor> bb = list(lqw);
//        System.out.println("15052222254"+bb);
//
//        Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
//        Page<ZfDoctor> pageResult = page(zfDoctorPage, lqw);
//        List<ZfDoctor> beanRecords = pageResult.getRecords();//得到查询出来的数据
//        System.out.println(beanRecords);
//
//        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
//
//
//        return AjaxResult.success(data);
////    }

//        private List<Long> buildCondition1(){
//        List<ZfDoctorShare> authority1 = zfDoctorShareService.getAuthority();
//        List<Long> idList1 = authority1.stream().filter(auth -> auth.getShareContent().toString().equals(DOCTOR_LIST)).map(ZfDoctorShare::getShareId).collect(Collectors.toList());