From 33f9eae4ad4321860e4881f5f38dad6368c878ef Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index 93fadf7..709c1aa 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -4,8 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
+
+import java.time.LocalDateTime;
import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
@@ -21,41 +22,41 @@
@AllArgsConstructor
@RequestMapping("/projectManagement/roles")
@Tag(name = "")
-public class RolesController extends BaseController {
+public class RolesController {
private RolesService rolesservice;
private RolesMapper rolesMapper;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
- public R<?> listPage(Page<Roles> page, Roles roles) {
- return R.ok(rolesservice.listPage(page, roles));
+ public AjaxResult listPage(Page<Roles> page, Roles roles) {
+ return AjaxResult.success(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody RoleDto roleDto) {
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
- roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no", roleDto.getCreateTime() != null ? roleDto.getCreateTime() : LocalDateTime.now()));
}
- return R.ok(rolesservice.save(roleDto));
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody Roles roles) {
- return R.ok(rolesservice.updateById(roles));
+ public AjaxResult update(@RequestBody Roles roles) {
+ return AjaxResult.success(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(rolesservice.removeBatchByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(rolesservice.removeBatchByIds(ids));
}
@PostMapping("/listSimpleRole")
- public R<?> listSimpleRole() {
- return R.ok(rolesservice.listSimpleRole());
+ public AjaxResult listSimpleRole() {
+ return AjaxResult.success(rolesservice.listSimpleRole());
}
}
--
Gitblit v1.9.3