bug修改

xuhy

4 天以前 2752955cea1ec190e5a2d27205b9391eea821148

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java

@@ -84,10 +84,12 @@
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserVO sysAppUserVO : list) {
            String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
@@ -95,7 +97,9 @@
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            }
                }
            sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString());
            }
        }

        pageInfo.setRecords(list);
@@ -111,10 +115,12 @@
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserListExport sysAppUserListExport : list) {
            String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
@@ -122,7 +128,9 @@
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            }
                }
            sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString());
            }
        }
        return list;
    }
@@ -136,10 +144,12 @@
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserClinicExport sysAppUserClinicExport : list) {
            String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
@@ -147,8 +157,10 @@
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            }
                }
            sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString());
        }
        }
        return list;
    }