1

src/main/java/com/fdkankan/fusion/service/IHotIconService.java

@@ -18,7 +18,7 @@ public interface IHotIconService extends IService<HotIcon> {
 
     List<HotIcon> getListByUserName(String username);
 
-    HotIcon getDefaultIcon();
+    List<HotIcon> getDefaultIcon();
 
     void addUseNum(Integer hotIconId);
 

src/main/java/com/fdkankan/fusion/service/impl/CaseTagServiceImpl.java

@@ -56,11 +56,11 @@ public class CaseTagServiceImpl extends ServiceImpl<ICaseTagMapper, CaseTag> imp
 
     @Override
     public void updateDFHotIcon(Integer iconId) {
-        HotIcon defaultIcon = hotIconService.getDefaultIcon();
+        List<HotIcon> defaultIcons = hotIconService.getDefaultIcon();
         LambdaUpdateWrapper<CaseTag> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(CaseTag::getHotIconId,iconId)
-                .set(CaseTag::getHotIconId,defaultIcon.getIconId())
-                .set(CaseTag::getHotIconUrl,defaultIcon.getIconUrl());
+                .set(CaseTag::getHotIconId,defaultIcons.get(0).getIconId())
+                .set(CaseTag::getHotIconUrl,defaultIcons.get(0).getIconUrl());
         this.update(wrapper);
     }
 

src/main/java/com/fdkankan/fusion/service/impl/HotIconServiceImpl.java

@@ -48,15 +48,12 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
     }
 
     @Override
-    public HotIcon getDefaultIcon() {
+    public List<HotIcon> getDefaultIcon() {
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HotIcon::getIsSystem,1);
-        wrapper.orderByDesc(HotIcon::getCreateTime);
+        wrapper.orderByAsc(HotIcon::getIconId);
         List<HotIcon> list = this.list(wrapper);
-        if(list!= null && list.size() >0){
-            return list.get(0);
-        }
-        return null;
+        return list;
     }
 
     @Override
@@ -96,7 +93,8 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
                 hotIconIds.addAll(ids);
             }
         }
-        hotIconIds.add(getDefaultIcon().getIconId());
+        List<Integer> collect = getDefaultIcon().stream().map(HotIcon::getIconId).collect(Collectors.toList());
+        hotIconIds.addAll(collect);
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HotIcon::getCaseId,caseId);
         List<HotIcon> list1 = this.list(wrapper);