From 4e833109c2105bf6895ac985205ce30da37c70d6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 11 三月 2026 17:26:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index dc4284a..e3ca4a3 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
@@ -17,7 +18,7 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/roles")
+@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {
@@ -32,9 +33,11 @@
@PostMapping("/add")
@ApiOperation("鏂板")
- public AjaxResult add(@RequestBody Roles role) {
- role.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
- return AjaxResult.success(rolesservice.save(role));
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
+ if (roleDto.getIsDefaultNo()) {
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
+ }
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
@@ -49,4 +52,9 @@
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(rolesservice.removeBatchByIds(ids));
}
+
+ @PostMapping("/listSimpleRole")
+ public AjaxResult listSimpleRole() {
+ return AjaxResult.success(rolesservice.listSimpleRole());
+ }
}
--
Gitblit v1.9.3