diff --git a/core/src/main/java/com/dite/znpt/mapper/RegulationTypeMapper.java b/core/src/main/java/com/dite/znpt/mapper/RegulationTypeMapper.java index 1065361..801d72e 100644 --- a/core/src/main/java/com/dite/znpt/mapper/RegulationTypeMapper.java +++ b/core/src/main/java/com/dite/znpt/mapper/RegulationTypeMapper.java @@ -18,7 +18,12 @@ public interface RegulationTypeMapper extends BaseMapper { * 分页查询制度类型列表(包含创建人姓名) * @param page 分页参数 * @param typeName 类型名称 + * @param status 是否启用(1-启用,0-禁用) + * @param remark 备注 * @return 分页结果 */ - Page selectRegulationTypeListWithCreator(Page page, @Param("typeName") String typeName); + Page selectRegulationTypeListWithCreator(Page page, + @Param("typeName") String typeName, + @Param("status") String status, + @Param("remark") String remark); } \ No newline at end of file diff --git a/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java index d29fcf7..2641a04 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java @@ -34,7 +34,7 @@ public class RegulationTypeServiceImpl extends ServiceImpl pageParam = new Page<>(page, size); // 使用连表查询获取创建人姓名 - Page result = this.baseMapper.selectRegulationTypeListWithCreator(pageParam, typeName); + Page result = this.baseMapper.selectRegulationTypeListWithCreator(pageParam, typeName, status, remark); return Result.ok(result); } catch (Exception e) {