1

src/main/java/com/fdkankan/fusion/controller/CaseOverviewController.java

@@ -75,6 +75,9 @@ public class CaseOverviewController extends BaseController{
     public ResultData addOrUpdate(@RequestBody CaseOverview caseOverview) {
         caseOverview.setPlatformId(getPlatformId());
         caseOverview.setSysUserId(getSysUserId());
+        if(StringUtils.isNotBlank(caseOverview.getNum()) && caseOverview.getSubGroup() == null){
+            caseOverview.setSubGroup(0);
+        }
         caseOverviewService.saveOrUpdate(caseOverview);
         if (caseOverview.getCaseTabulation() != null) {
             caseOverview.getCaseTabulation().setOverviewId(caseOverview.getId());

src/main/java/com/fdkankan/fusion/controller/DictIconController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.fusion.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2025-08-20
- */
-@RestController
-@RequestMapping("/fusion/dictIcon")
-public class DictIconController {
-
-}
-

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

@@ -7,6 +7,7 @@ import com.fdkankan.fusion.service.ICaseFilesTypeIconService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -30,11 +31,9 @@ public class CaseFilesTypeIconServiceImpl extends ServiceImpl<ICaseFilesTypeIcon
             wrapper.in(CaseFilesTypeIcon::getFilesTypeId,ids);
             List<CaseFilesTypeIcon> list = this.list(wrapper);
             for (CaseFilesTypeIcon dictIcon : list) {
-                if(map.get(dictIcon.getFilesTypeId()) == null){
-                    map.put(dictIcon.getFilesTypeId(), Arrays.asList(dictIcon));
-                }else {
-                    map.get(dictIcon.getFilesTypeId()).add(dictIcon);
-                }
+                map.computeIfAbsent(dictIcon.getFilesTypeId(), k -> new ArrayList<>());
+                map.get(dictIcon.getFilesTypeId()).add(dictIcon);
+
             }
         }
         return map;

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

@@ -39,7 +39,15 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
     public List<CaseFilesType> getByParentId(Integer parentId) {
         LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseFilesType::getParentId,parentId);
-        return this.list(wrapper);
+        wrapper.orderByAsc(CaseFilesType::getSort);
+        List<CaseFilesType> list = this.list(wrapper);
+
+        List<Integer> ids = list.stream().map(CaseFilesType::getFilesTypeId).collect(Collectors.toList());
+        HashMap<Integer,List<CaseFilesTypeIcon>> iconMap  = caseFilesTypeIconService.getMapByTypeIds(ids);
+        for (CaseFilesType caseFilesType : list) {
+            caseFilesType.setIconList(iconMap.get(caseFilesType.getFilesTypeId()));
+        }
+        return list;
     }
 
     @Override

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

@@ -274,7 +274,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         }
         model.setNum(num);
 
-
+        this.save(model);
         return model;
     }