diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java index 76bbf4aac..7596e80f8 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java @@ -186,6 +186,7 @@ public class SchoolEnterpriseAchievements extends BaseEntity { ) private String achievementCurStatus; //团队名称 + @Excel(name = "成果团队名称") private String teamName; private List teamList; diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java index e8970b157..d06efdfbc 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java @@ -222,6 +222,7 @@ public class SchoolEnterpriseAchievementsServiceImpl implements ISchoolEnterpris private String handleAchievementImage(SchoolEnterpriseAchievements achievement, Map imageMap) { String imageCellKey = achievement.getImages(); if (StringUtils.isEmpty(imageCellKey) || !imageMap.containsKey(imageCellKey)) { + achievement.setImages("[]"); return "无图片,跳过处理"; } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml index 6a7baee98..ee71b8b67 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml @@ -473,7 +473,7 @@ from ( (select count(1) as "auditSum" from memos - where destroy_status is null and hidden = 0 and published_at is not null) a, + where destroy_status is null and hidden = 0 and published_at is not null AND root_id IS NULL) a, (select count(1) as "allSum" from memos) b, (select count(1) as "currentYearSum" from memos