diff --git a/flex-ui/src/api/mf/student.js b/flex-ui/src/api/mf/student.js new file mode 100644 index 0000000..65297d8 --- /dev/null +++ b/flex-ui/src/api/mf/student.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询学生信息表列表 +export function listStudent(query) { + return request({ + url: '/mf/student/list', + method: 'get', + params: query + }) +} + +// 查询学生信息表详细 +export function getStudent(studentId) { + return request({ + url: '/mf/student/' + studentId, + method: 'get' + }) +} + +// 新增学生信息表 +export function addStudent(data) { + return request({ + url: '/mf/student', + method: 'post', + data: data + }) +} + +// 修改学生信息表 +export function updateStudent(data) { + return request({ + url: '/mf/student', + method: 'put', + data: data + }) +} + +// 删除学生信息表 +export function delStudent(studentId) { + return request({ + url: '/mf/student/' + studentId, + method: 'delete' + }) +} diff --git a/flex-ui/src/views/mf/student/index.vue b/flex-ui/src/views/mf/student/index.vue new file mode 100644 index 0000000..b2cdf14 --- /dev/null +++ b/flex-ui/src/views/mf/student/index.vue @@ -0,0 +1,336 @@ + + + diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml index ccc3b57..d9db732 100644 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ b/ruoyi-modules/ruoyi-demo/pom.xml @@ -32,6 +32,16 @@ ruoyi-common-springdoc + + com.ruoyi + ruoyi-common-excel + + + + com.ruoyi + ruoyi-common-log + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java new file mode 100644 index 0000000..a7d8f80 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java @@ -0,0 +1,116 @@ +package com.ruoyi.mf.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 com.ruoyi.common.core.core.domain.R; +import com.ruoyi.common.excel.utils.ExcelUtil; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.web.annotation.RepeatSubmit; +import com.ruoyi.common.web.core.BaseController; +import jakarta.annotation.Resource; +import com.ruoyi.mf.domain.vo.MfStudentVo; +import com.ruoyi.mf.domain.bo.MfStudentBo; +import com.ruoyi.mf.service.IMfStudentService; + +import com.ruoyi.common.orm.core.page.TableDataInfo; + +/** + * 学生信息表Controller + * + * @author 数据小王子 + * 2023-11-22 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mf/student") +public class MfStudentController extends BaseController +{ + @Resource + private IMfStudentService mfStudentService; + + /** + * 查询学生信息表列表 + */ + @SaCheckPermission("mf:student:list") + @GetMapping("/list") + public TableDataInfo list(MfStudentBo mfStudentBo) + { + return mfStudentService.selectPage(mfStudentBo); + } + + /** + * 导出学生信息表列表 + */ + @SaCheckPermission("mf:student:export") + @Log(title = "学生信息表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MfStudentBo mfStudentBo) + { + List list = mfStudentService.selectList(mfStudentBo); + ExcelUtil.exportExcel(list, "学生信息表", MfStudentVo.class, response); + } + + /** + * 获取学生信息表详细信息 + */ + @SaCheckPermission("mf:student:query") + @GetMapping(value = "/{studentId}") + public R getInfo(@PathVariable Long studentId) + { + return R.ok(mfStudentService.selectById(studentId)); + } + + /** + * 新增学生信息表 + */ + @SaCheckPermission("mf:student:add") + @Log(title = "学生信息表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping + public R add(@Validated @RequestBody MfStudentBo mfStudentBo) + { + boolean inserted = mfStudentService.insert(mfStudentBo); + if (!inserted) { + return R.fail("新增学生信息表记录失败！"); + } + return R.ok(); + } + + /** + * 修改学生信息表 + */ + @SaCheckPermission("mf:student:edit") + @Log(title = "学生信息表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping + public R edit(@Validated @RequestBody MfStudentBo mfStudentBo) + { + Boolean updated = mfStudentService.update(mfStudentBo); + if (!updated) { + R.fail("修改学生信息表记录失败!"); + } + return R.ok(); + } + + /** + * 删除学生信息表 + */ + @SaCheckPermission("mf:student:remove") + @Log(title = "学生信息表", businessType = BusinessType.DELETE) + @DeleteMapping("/{studentIds}") + public R remove(@PathVariable Long[] studentIds) + { + boolean deleted = mfStudentService.deleteByIds(studentIds); + if (!deleted) { + R.fail("删除学生信息表记录失败!"); + } + return R.ok(); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/MfStudent.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/MfStudent.java new file mode 100644 index 0000000..6f2630d --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/MfStudent.java @@ -0,0 +1,44 @@ +package com.ruoyi.mf.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.ruoyi.common.orm.core.domain.BaseEntity; + +/** + * 学生信息表对象 mf_student + * + * @author 数据小王子 + * 2023-11-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Table(value = "mf_student") +public class MfStudent extends BaseEntity +{ + /** 编号 */ + @Id + private Long studentId; + + /** 学生名称 */ + private String studentName; + + /** 年龄 */ + private Long studentAge; + + /** 爱好（0代码 1音乐 2电影） */ + private String studentHobby; + + /** 性别（1男 2女 3未知） */ + private String studentGender; + + /** 状态（0正常 1停用） */ + private String studentStatus; + + /** 生日 */ + private Date studentBirthday; + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/bo/MfStudentBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/bo/MfStudentBo.java new file mode 100644 index 0000000..7881d0d --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/bo/MfStudentBo.java @@ -0,0 +1,66 @@ +package com.ruoyi.mf.domain.bo; + +import com.ruoyi.mf.domain.MfStudent; +import com.ruoyi.common.orm.core.domain.BaseEntity; +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; + +/** + * 学生信息表业务对象 mf_student + * + * @author 数据小王子 + * @date 2023-11-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = MfStudent.class, reverseConvertGenerate = false) +public class MfStudentBo extends BaseEntity { + + /** + * 编号 + */ + private Long studentId; + + /** + * 学生名称 + */ + @NotBlank(message = "学生名称不能为空") + private String studentName; + + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + private Long studentAge; + + /** + * 爱好（0代码 1音乐 2电影） + */ + @NotBlank(message = "爱好（0代码 1音乐 2电影）不能为空") + private String studentHobby; + + /** + * 性别（1男 2女 3未知） + */ + @NotBlank(message = "性别（1男 2女 3未知）不能为空") + private String studentGender; + + /** + * 状态（0正常 1停用） + */ + @NotBlank(message = "状态（0正常 1停用）不能为空") + private String studentStatus; + + /** + * 生日 + */ + @NotNull(message = "生日不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date studentBirthday; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/vo/MfStudentVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/vo/MfStudentVo.java new file mode 100644 index 0000000..a7c5904 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/domain/vo/MfStudentVo.java @@ -0,0 +1,65 @@ +package com.ruoyi.mf.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.mf.domain.MfStudent; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.excel.annotation.ExcelDictFormat; +import com.ruoyi.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; +import com.ruoyi.common.orm.core.domain.BaseEntity; + + +/** + * 学生信息表视图对象 mf_student + * + * @author 数据小王子 + * @date 2023-11-22 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = MfStudent.class) +public class MfStudentVo extends BaseEntity implements Serializable +{ + + @Serial + private static final long serialVersionUID = 1L; + + /** 编号 */ + @ExcelProperty(value = "编号") + private Long studentId; + + /** 学生名称 */ + @ExcelProperty(value = "学生名称") + private String studentName; + + /** 年龄 */ + @ExcelProperty(value = "年龄") + private Long studentAge; + + /** 爱好（0代码 1音乐 2电影） */ + @ExcelProperty(value = "爱好", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_student_hobby") + private String studentHobby; + + /** 性别（1男 2女 3未知） */ + @ExcelProperty(value = "性别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_user_gender") + private String studentGender; + + /** 状态（0正常 1停用） */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_student_status") + private String studentStatus; + + /** 生日 */ + @ExcelProperty(value = "生日") + private Date studentBirthday; + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/mapper/MfStudentMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/mapper/MfStudentMapper.java new file mode 100644 index 0000000..ce71065 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/mapper/MfStudentMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.mf.mapper; + +import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import com.ruoyi.mf.domain.MfStudent; + +/** + * 学生信息表Mapper接口 + * + * @author 数据小王子 + * 2023-11-22 + */ +@Mapper +public interface MfStudentMapper extends BaseMapper +{ + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/IMfStudentService.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/IMfStudentService.java new file mode 100644 index 0000000..098cbc5 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/IMfStudentService.java @@ -0,0 +1,66 @@ +package com.ruoyi.mf.service; + +import java.util.List; +import com.ruoyi.mf.domain.MfStudent; +import com.ruoyi.mf.domain.vo.MfStudentVo; +import com.ruoyi.mf.domain.bo.MfStudentBo; +import com.ruoyi.common.orm.core.service.IBaseService; +import com.ruoyi.common.orm.core.page.TableDataInfo; + +/** + * 学生信息表Service接口 + * + * @author 数据小王子 + * 2023-11-22 + */ +public interface IMfStudentService extends IBaseService +{ + /** + * 查询学生信息表 + * + * @param studentId 学生信息表主键 + * @return 学生信息表 + */ + MfStudentVo selectById(Long studentId); + + /** + * 查询学生信息表列表 + * + * @param mfStudentBo 学生信息表Bo + * @return 学生信息表集合 + */ + List selectList(MfStudentBo mfStudentBo); + + /** + * 分页查询学生信息表列表 + * + * @param mfStudentBo 学生信息表Bo + * @return 分页学生信息表集合 + */ + TableDataInfo selectPage(MfStudentBo mfStudentBo); + + /** + * 新增学生信息表 + * + * @param mfStudentBo 学生信息表Bo + * @return 结果:true 操作成功，false 操作失败 + */ + boolean insert(MfStudentBo mfStudentBo); + + /** + * 修改学生信息表 + * + * @param mfStudentBo 学生信息表Bo + * @return 结果:true 更新成功，false 更新失败 + */ + boolean update(MfStudentBo mfStudentBo); + + /** + * 批量删除学生信息表 + * + * @param studentIds 需要删除的学生信息表主键集合 + * @return 结果:true 删除成功，false 删除失败 + */ + boolean deleteByIds(Long[] studentIds); + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/impl/MfStudentServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/impl/MfStudentServiceImpl.java new file mode 100644 index 0000000..b259745 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/service/impl/MfStudentServiceImpl.java @@ -0,0 +1,137 @@ +package com.ruoyi.mf.service.impl; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import cn.hutool.core.util.ObjectUtil; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; +import com.ruoyi.common.core.utils.MapstructUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.orm.core.page.PageQuery; +import com.ruoyi.common.orm.core.page.TableDataInfo; +import com.ruoyi.common.orm.core.service.impl.BaseServiceImpl; +import com.ruoyi.common.core.utils.DateUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.mf.mapper.MfStudentMapper; +import com.ruoyi.mf.domain.MfStudent; +import com.ruoyi.mf.domain.bo.MfStudentBo; +import com.ruoyi.mf.domain.vo.MfStudentVo; +import com.ruoyi.mf.service.IMfStudentService; + +import static com.ruoyi.mf.domain.table.MfStudentTableDef.MF_STUDENT; + +/** + * 学生信息表Service业务层处理 + * + * @author 数据小王子 + * 2023-11-22 + */ +@Service +public class MfStudentServiceImpl extends BaseServiceImpl implements IMfStudentService +{ + @Resource + private MfStudentMapper mfStudentMapper; + + @Override + public QueryWrapper query() { + return super.query().from(MF_STUDENT); + } + + private QueryWrapper buildQueryWrapper(MfStudentBo mfStudentBo) { + QueryWrapper queryWrapper = super.buildBaseQueryWrapper(); + + if (StringUtils.isNotBlank(mfStudentBo.getStudentName())) { + queryWrapper.and(MF_STUDENT.STUDENT_NAME.like(mfStudentBo.getStudentName())); + } + if (StringUtils.isNotBlank(mfStudentBo.getStudentStatus())) { + queryWrapper.and(MF_STUDENT.STUDENT_STATUS.eq(mfStudentBo.getStudentStatus())); + } + + return queryWrapper; + } + + /** + * 查询学生信息表 + * + * @param studentId 学生信息表主键 + * @return 学生信息表 + */ + @Override + public MfStudentVo selectById(Long studentId) + { + return this.getOneAs(query().where(MF_STUDENT.STUDENT_ID.eq(studentId)), MfStudentVo.class); + } + + /** + * 查询学生信息表列表 + * + * @param mfStudentBo 学生信息表Bo + * @return 学生信息表集合 + */ + @Override + public List selectList(MfStudentBo mfStudentBo) + { + QueryWrapper queryWrapper = buildQueryWrapper(mfStudentBo); + return this.listAs(queryWrapper, MfStudentVo.class); + } + + /** + * 分页查询学生信息表列表 + * + * @param mfStudentBo 学生信息表Bo + * @return 分页学生信息表集合 + */ + @Override + public TableDataInfo selectPage(MfStudentBo mfStudentBo) + { + QueryWrapper queryWrapper = buildQueryWrapper(mfStudentBo); + Page page = this.pageAs(PageQuery.build(), queryWrapper, MfStudentVo.class); + return TableDataInfo.build(page); + } + + /** + * 新增学生信息表 + * + * @param mfStudentBo 学生信息表Bo + * @return 结果:true 操作成功，false 操作失败 + */ + @Override + public boolean insert(MfStudentBo mfStudentBo) + { + MfStudent mfStudent = MapstructUtils.convert(mfStudentBo, MfStudent.class); + + return this.save(mfStudent);//使用全局配置的雪花算法主键生成器生成ID值 + } + + /** + * 修改学生信息表 + * + * @param mfStudentBo 学生信息表Bo + * @return 结果:true 更新成功，false 更新失败 + */ + @Override + public boolean update(MfStudentBo mfStudentBo) + { + MfStudent mfStudent = MapstructUtils.convert(mfStudentBo, MfStudent.class); + boolean updated = this.updateById(mfStudent); + + return updated; + } + + /** + * 批量删除学生信息表 + * + * @param studentIds 需要删除的学生信息表主键集合 + * @return 结果:true 删除成功，false 删除失败 + */ + @Transactional + @Override + public boolean deleteByIds(Long[] studentIds) + { + return this.removeByIds(Arrays.asList(studentIds)); + } + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/mf/MfStudentMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/mf/MfStudentMapper.xml new file mode 100644 index 0000000..a9989ba --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/mf/MfStudentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java index c7997d4..22263cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java @@ -1,10 +1,12 @@ package com.ruoyi.system.controller.system; + import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.core.core.domain.R; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.orm.core.page.TableDataInfo; +import com.ruoyi.common.web.annotation.RepeatSubmit; import com.ruoyi.system.domain.bo.SysNoticeBo; import com.ruoyi.system.domain.vo.SysNoticeVo; import jakarta.annotation.Resource; @@ -60,6 +62,7 @@ public class SysNoticeController extends BaseController */ @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) + @RepeatSubmit() @PostMapping public R add(@Validated @RequestBody SysNoticeBo noticeBo) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java index 5f33ef2..7ebfaed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java @@ -2,8 +2,6 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.translation.annotation.Translation; import com.ruoyi.common.translation.constant.TransConstant; -import com.ruoyi.system.domain.SysNotice; -import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java index c1f5db3..eccc8f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java @@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; -import com.ruoyi.system.domain.SysPost; -import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 617a902..6621258 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -6,17 +6,13 @@ import java.util.List; import cn.hutool.core.util.ObjectUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; -import com.ruoyi.common.core.core.page.PageDomain; -import com.ruoyi.common.core.core.page.TableSupport; import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.sql.SqlUtil; import com.ruoyi.common.orm.core.page.PageQuery; import com.ruoyi.common.orm.core.page.TableDataInfo; import com.ruoyi.common.orm.core.service.impl.BaseServiceImpl; import com.ruoyi.system.domain.bo.SysNoticeBo; import com.ruoyi.system.domain.vo.SysNoticeVo; -import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 82ce40d..fdbb063 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -95,8 +95,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl queryWrapper.and(SYS_ROLE.CREATE_TIME.between(params.get("beginTime"), params.get("endTime"))); } - //TODO:添加 数据权限 过滤条件 - queryWrapper.orderBy(SYS_ROLE.ROLE_SORT.asc()); return queryWrapper;