feat: 企标级别映射列表接口三级部门Id置空
This commit is contained in:
+3
-2
@@ -40,13 +40,13 @@ public class LawsGradeServiceImpl extends ServiceImpl<LawsGradeMapper, LawsGrade
|
|||||||
public List<LawsGrade> queryList() {
|
public List<LawsGrade> queryList() {
|
||||||
List<LawsGrade> grades = lawsGradeService.list();
|
List<LawsGrade> grades = lawsGradeService.list();
|
||||||
List<LawsEnterpriseStandardLevel> standardLevels = lawsEnterpriseStandardLevelService.list();
|
List<LawsEnterpriseStandardLevel> standardLevels = lawsEnterpriseStandardLevelService.list();
|
||||||
if (standardLevels == null || standardLevels.size() == 0 || grades == null || grades.size() == 0){
|
if (standardLevels == null || standardLevels.isEmpty() || grades == null || grades.isEmpty()){
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
Map<String, List<LawsEnterpriseStandardLevel>> map = standardLevels.stream().collect(Collectors.groupingBy(LawsEnterpriseStandardLevel::getGradeId));
|
Map<String, List<LawsEnterpriseStandardLevel>> map = standardLevels.stream().collect(Collectors.groupingBy(LawsEnterpriseStandardLevel::getGradeId));
|
||||||
for (LawsGrade grade : grades) {
|
for (LawsGrade grade : grades) {
|
||||||
List<LawsEnterpriseStandardLevel> levels = map.get(grade.getId());
|
List<LawsEnterpriseStandardLevel> levels = map.get(grade.getId());
|
||||||
if (levels != null && levels.size() > 0){
|
if (levels != null && !levels.isEmpty()){
|
||||||
List<String> collect = levels.stream().map(LawsEnterpriseStandardLevel::getDeptId).distinct().collect(Collectors.toList());
|
List<String> collect = levels.stream().map(LawsEnterpriseStandardLevel::getDeptId).distinct().collect(Collectors.toList());
|
||||||
List<SysDepart> sysDepartList = sysDepartService.listByIds(collect);
|
List<SysDepart> sysDepartList = sysDepartService.listByIds(collect);
|
||||||
String departNames = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
|
String departNames = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
|
||||||
@@ -57,6 +57,7 @@ public class LawsGradeServiceImpl extends ServiceImpl<LawsGradeMapper, LawsGrade
|
|||||||
}
|
}
|
||||||
grades.get(0).setDeptNames("供应商");
|
grades.get(0).setDeptNames("供应商");
|
||||||
grades.get(3).setDeptNames("主起草部门");
|
grades.get(3).setDeptNames("主起草部门");
|
||||||
|
grades.get(3).setDeptIds(null);
|
||||||
return grades;
|
return grades;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user