合同信息基础接口

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.platform.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.platform.domain.vo.ContractInfoVo;
+import org.dromara.platform.domain.bo.ContractInfoBo;
+import org.dromara.platform.service.IContractInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 合同信息
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/platform/contractInfo")
+public class ContractInfoController extends BaseController {
+
+    private final IContractInfoService contractInfoService;
+
+    /**
+     * 查询合同信息列表
+     */
+    @SaCheckPermission("platform:contractInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ContractInfoVo> list(ContractInfoBo bo, PageQuery pageQuery) {
+        return contractInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出合同信息列表
+     */
+    @SaCheckPermission("platform:contractInfo:export")
+    @Log(title = "合同信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ContractInfoBo bo, HttpServletResponse response) {
+        List<ContractInfoVo> list = contractInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "合同信息", ContractInfoVo.class, response);
+    }
+
+    /**
+     * 获取合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("platform:contractInfo:query")
+    @GetMapping("/{id}")
+    public R<ContractInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(contractInfoService.queryById(id));
+    }
+
+    /**
+     * 新增合同信息
+     */
+    @SaCheckPermission("platform:contractInfo:add")
+    @Log(title = "合同信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ContractInfoBo bo) {
+        return toAjax(contractInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改合同信息
+     */
+    @SaCheckPermission("platform:contractInfo:edit")
+    @Log(title = "合同信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ContractInfoBo bo) {
+        return toAjax(contractInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除合同信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("platform:contractInfo:remove")
+    @Log(title = "合同信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(contractInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java

@@ -154,7 +154,8 @@ public class ServiceCatalogCategoryController extends BaseController {
     @SaCheckPermission("platform:catalogCategory:queryAllCategoryName")
     @GetMapping("/queryAllCategoryName")
     public R<List<ServiceCatalogSelectVo>> queryAllCategoryName() {
-        return R.ok(serviceCatalogCategoryService.queryAllCatalogName());
+        List<ServiceCatalogSelectVo> rs = serviceCatalogCategoryService.queryAllCatalogName();
+        return R.ok(rs);
     }
 
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java

@@ -0,0 +1,134 @@
+package org.dromara.platform.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 合同信息对象 contract_info
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("contract_info")
+public class ContractInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 合同名称
+     */
+    private String contractName;
+
+    /**
+     * 合同编号
+     */
+    private String contractCode;
+
+    /**
+     * 所有者ID
+     */
+    private String ownerId;
+
+    /**
+     * 所有者名称
+     */
+    private String ownerName;
+
+    /**
+     * 是否为子合同（1表示是子合同，0或NULL则不是）
+     */
+    private Long isChildren;
+
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
+    /**
+     * 所属区域
+     */
+    private String district;
+
+    /**
+     * 合同金额
+     */
+    private Long contractPrice;
+
+    /**
+     * 签订日期
+     */
+    private Date signDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    private Date endDate;
+
+    /**
+     * 甲方单位
+     */
+    private String partyA;
+
+    /**
+     * 甲方代表
+     */
+    private String partyAPerson;
+
+    /**
+     * 乙方单位
+     */
+    private String partyB;
+
+    /**
+     * 乙方代表
+     */
+    private String partyBPerson;
+
+    /**
+     * 合同内容
+     */
+    private String contractContent;
+
+    /**
+     * 合同备注
+     */
+    private String remark;
+
+    /**
+     * 附件
+     */
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    private Long status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java

@@ -0,0 +1,146 @@
+package org.dromara.platform.domain.bo;
+
+import org.dromara.platform.domain.ContractInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 合同信息业务对象 contract_info
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ContractInfo.class, reverseConvertGenerate = false)
+public class ContractInfoBo extends BaseEntity {
+
+    /**
+     * 唯一标识符
+     */
+    @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 合同名称
+     */
+    @NotBlank(message = "合同名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contractName;
+
+    /**
+     * 合同编号
+     */
+    @NotBlank(message = "合同编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contractCode;
+
+    /**
+     * 所有者ID
+     */
+    @NotBlank(message = "所有者ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ownerId;
+
+    /**
+     * 所有者名称
+     */
+    @NotBlank(message = "所有者名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ownerName;
+
+    /**
+     * 是否为子合同（1表示是子合同，0或NULL则不是）
+     */
+    @NotNull(message = "是否为子合同（1表示是子合同，0或NULL则不是）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long isChildren;
+
+    /**
+     * 合同类型
+     */
+    @NotBlank(message = "合同类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contractType;
+
+    /**
+     * 所属区域
+     */
+    @NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String district;
+
+    /**
+     * 合同金额
+     */
+    @NotNull(message = "合同金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long contractPrice;
+
+    /**
+     * 签订日期
+     */
+    @NotNull(message = "签订日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date signDate;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endDate;
+
+    /**
+     * 甲方单位
+     */
+    @NotBlank(message = "甲方单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String partyA;
+
+    /**
+     * 甲方代表
+     */
+    @NotBlank(message = "甲方代表不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String partyAPerson;
+
+    /**
+     * 乙方单位
+     */
+    @NotBlank(message = "乙方单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String partyB;
+
+    /**
+     * 乙方代表
+     */
+    @NotBlank(message = "乙方代表不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String partyBPerson;
+
+    /**
+     * 合同内容
+     */
+    @NotBlank(message = "合同内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contractContent;
+
+    /**
+     * 合同备注
+     */
+    @NotBlank(message = "合同备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 附件
+     */
+    @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.java

@@ -0,0 +1,155 @@
+package org.dromara.platform.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.platform.domain.ContractInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 合同信息视图对象 contract_info
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ContractInfo.class)
+public class ContractInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @ExcelProperty(value = "唯一标识符")
+    private String id;
+
+    /**
+     * 合同名称
+     */
+    @ExcelProperty(value = "合同名称")
+    private String contractName;
+
+    /**
+     * 合同编号
+     */
+    @ExcelProperty(value = "合同编号")
+    private String contractCode;
+
+    /**
+     * 所有者ID
+     */
+    @ExcelProperty(value = "所有者ID")
+    private String ownerId;
+
+    /**
+     * 所有者名称
+     */
+    @ExcelProperty(value = "所有者名称")
+    private String ownerName;
+
+    /**
+     * 是否为子合同（1表示是子合同，0或NULL则不是）
+     */
+    @ExcelProperty(value = "是否为子合同", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=表示是子合同，0或NULL则不是")
+    private Long isChildren;
+
+    /**
+     * 合同类型
+     */
+    @ExcelProperty(value = "合同类型")
+    private String contractType;
+
+    /**
+     * 所属区域
+     */
+    @ExcelProperty(value = "所属区域")
+    private String district;
+
+    /**
+     * 合同金额
+     */
+    @ExcelProperty(value = "合同金额")
+    private Long contractPrice;
+
+    /**
+     * 签订日期
+     */
+    @ExcelProperty(value = "签订日期")
+    private Date signDate;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endDate;
+
+    /**
+     * 甲方单位
+     */
+    @ExcelProperty(value = "甲方单位")
+    private String partyA;
+
+    /**
+     * 甲方代表
+     */
+    @ExcelProperty(value = "甲方代表")
+    private String partyAPerson;
+
+    /**
+     * 乙方单位
+     */
+    @ExcelProperty(value = "乙方单位")
+    private String partyB;
+
+    /**
+     * 乙方代表
+     */
+    @ExcelProperty(value = "乙方代表")
+    private String partyBPerson;
+
+    /**
+     * 合同内容
+     */
+    @ExcelProperty(value = "合同内容")
+    private String contractContent;
+
+    /**
+     * 合同备注
+     */
+    @ExcelProperty(value = "合同备注")
+    private String remark;
+
+    /**
+     * 附件
+     */
+    @ExcelProperty(value = "附件")
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Long status;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ContractInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.platform.mapper;
+
+import org.dromara.platform.domain.ContractInfo;
+import org.dromara.platform.domain.vo.ContractInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 合同信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+public interface ContractInfoMapper extends BaseMapperPlus<ContractInfo, ContractInfoVo> {
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IContractInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.platform.service;
+
+import org.dromara.platform.domain.vo.ContractInfoVo;
+import org.dromara.platform.domain.bo.ContractInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 合同信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+public interface IContractInfoService {
+
+    /**
+     * 查询合同信息
+     *
+     * @param id 主键
+     * @return 合同信息
+     */
+    ContractInfoVo queryById(String id);
+
+    /**
+     * 分页查询合同信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同信息分页列表
+     */
+    TableDataInfo<ContractInfoVo> queryPageList(ContractInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的合同信息列表
+     *
+     * @param bo 查询条件
+     * @return 合同信息列表
+     */
+    List<ContractInfoVo> queryList(ContractInfoBo bo);
+
+    /**
+     * 新增合同信息
+     *
+     * @param bo 合同信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ContractInfoBo bo);
+
+    /**
+     * 修改合同信息
+     *
+     * @param bo 合同信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ContractInfoBo bo);
+
+    /**
+     * 校验并批量删除合同信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ContractInfoServiceImpl.java

@@ -0,0 +1,146 @@
+package org.dromara.platform.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.platform.domain.bo.ContractInfoBo;
+import org.dromara.platform.domain.vo.ContractInfoVo;
+import org.dromara.platform.domain.ContractInfo;
+import org.dromara.platform.mapper.ContractInfoMapper;
+import org.dromara.platform.service.IContractInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 合同信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-03-26
+ */
+@RequiredArgsConstructor
+@Service
+public class ContractInfoServiceImpl implements IContractInfoService {
+
+    private final ContractInfoMapper baseMapper;
+
+    /**
+     * 查询合同信息
+     *
+     * @param id 主键
+     * @return 合同信息
+     */
+    @Override
+    public ContractInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询合同信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同信息分页列表
+     */
+    @Override
+    public TableDataInfo<ContractInfoVo> queryPageList(ContractInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ContractInfo> lqw = buildQueryWrapper(bo);
+        Page<ContractInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的合同信息列表
+     *
+     * @param bo 查询条件
+     * @return 合同信息列表
+     */
+    @Override
+    public List<ContractInfoVo> queryList(ContractInfoBo bo) {
+        LambdaQueryWrapper<ContractInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ContractInfo> buildQueryWrapper(ContractInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ContractInfo> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getContractName()), ContractInfo::getContractName, bo.getContractName());
+        lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), ContractInfo::getContractCode, bo.getContractCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getOwnerId()), ContractInfo::getOwnerId, bo.getOwnerId());
+        lqw.like(StringUtils.isNotBlank(bo.getOwnerName()), ContractInfo::getOwnerName, bo.getOwnerName());
+        lqw.eq(bo.getIsChildren() != null, ContractInfo::getIsChildren, bo.getIsChildren());
+        lqw.eq(StringUtils.isNotBlank(bo.getContractType()), ContractInfo::getContractType, bo.getContractType());
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ContractInfo::getDistrict, bo.getDistrict());
+        lqw.eq(bo.getContractPrice() != null, ContractInfo::getContractPrice, bo.getContractPrice());
+        lqw.eq(bo.getSignDate() != null, ContractInfo::getSignDate, bo.getSignDate());
+        lqw.eq(bo.getStartDate() != null, ContractInfo::getStartDate, bo.getStartDate());
+        lqw.eq(bo.getEndDate() != null, ContractInfo::getEndDate, bo.getEndDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartyA()), ContractInfo::getPartyA, bo.getPartyA());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartyAPerson()), ContractInfo::getPartyAPerson, bo.getPartyAPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartyB()), ContractInfo::getPartyB, bo.getPartyB());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartyBPerson()), ContractInfo::getPartyBPerson, bo.getPartyBPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getContractContent()), ContractInfo::getContractContent, bo.getContractContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), ContractInfo::getAttachment, bo.getAttachment());
+        lqw.eq(bo.getStatus() != null, ContractInfo::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增合同信息
+     *
+     * @param bo 合同信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ContractInfoBo bo) {
+        ContractInfo add = MapstructUtils.convert(bo, ContractInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改合同信息
+     *
+     * @param bo 合同信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ContractInfoBo bo) {
+        ContractInfo update = MapstructUtils.convert(bo, ContractInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ContractInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除合同信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java

@@ -17,6 +17,7 @@ import org.dromara.platform.mapper.ServiceCatalogCategoryMapper;
 import org.dromara.platform.service.IServiceCatalogCategoryService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 服务目录-类别Service业务层处理
@@ -229,7 +230,11 @@ public class ServiceCatalogCategoryServiceImpl implements IServiceCatalogCategor
     @Override
     public List<ServiceCatalogSelectVo> queryAllCatalogName() {
         List<ServiceCatalogSelectVo> serviceCatalogSelectVo = baseMapper.getServiceCatalogSelectVo();
-        return serviceCatalogSelectVo;
+        // 遍历categoryName包含小类的categoryName 过滤掉
+        List<ServiceCatalogSelectVo> filteredList = serviceCatalogSelectVo.stream()
+            .filter(serviceCatalog -> !serviceCatalog.getCategoryName().contains("小类"))
+            .collect(Collectors.toList());
+        return filteredList;
     }
 
     @Override