Merge remote-tracking branch 'origin/master'

doum

5 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java

@@ -252,11 +252,17 @@
                }
            }
            java.util.Map<Integer, String> relationNameMap = new java.util.HashMap<>();
            java.util.Map<Integer, String> relationOtherFieldMap = new java.util.HashMap<>();
            java.util.Map<Integer, String> relationRemarkMap = new java.util.HashMap<>();
            if (!relationIds.isEmpty()) {
                categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                        .in(Category::getId, relationIds)
                        .eq(Category::getDeleted, Constants.ZERO))
                        .forEach(c -> relationNameMap.put(c.getId(), c.getName()));
                        .forEach(c -> {
                            relationNameMap.put(c.getId(), c.getName());
                            relationOtherFieldMap.put(c.getId(), c.getOtherField());
                            relationRemarkMap.put(c.getId(), c.getRemark());
                        });
            }
            for (Category category:categoryList) {
                if(StringUtils.isNotBlank(category.getIcon())){
@@ -264,6 +270,8 @@
                }
                if (category.getRelationId() != null) {
                    category.setRelationName(relationNameMap.get(category.getRelationId()));
                    category.setRelationOtherField(relationOtherFieldMap.get(category.getRelationId()));
                    category.setRelationRemark(relationRemarkMap.get(category.getRelationId()));
                }
            }
        }