Merge remote-tracking branch 'origin/master'

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java

@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Map;
 
 
 /**

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java

@@ -87,4 +87,4 @@ public interface CategoryDictService extends BaseService<CategoryDictEntity> {
     List<CategoryDictDTO> list(Integer pageNo, Integer pageSize);
 
     List<CategoryDictDTO> listSubCategories(String parentCategoryId);
-}
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java

@@ -139,6 +139,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl<CategoryDictDao, Ca
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
         List<String> idList = Arrays.asList(ids);
 
         List<Boolean> idList2Del = idList.stream().map(id -> {
@@ -169,4 +170,4 @@ public class CategoryDictServiceImpl extends BaseServiceImpl<CategoryDictDao, Ca
         List<CategoryDictEntity> list = baseDao.selectList(query);
         return ConvertUtils.sourceToTarget(list, CategoryDictDTO.class);
     }
-}
+}