From 0ec581bd195ea9c06c38ef4f91ac7497a87b8ca3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 17:49:54 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index d19b4fc..3385128 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -35,7 +35,7 @@
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
- roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
}
return AjaxResult.success(rolesservice.save(roleDto));
}
@@ -52,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